Signed-off-by: Juan Quintela <quint...@redhat.com> --- hw/virtio-net.c | 21 ++++++++++++++++++--- 1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/hw/virtio-net.c b/hw/virtio-net.c index 97db0d0..cf13e94 100644 --- a/hw/virtio-net.c +++ b/hw/virtio-net.c @@ -63,6 +63,21 @@ typedef struct VirtIONet * - we could suppress RX interrupt if we were so inclined. */ +static void vlan_add(VirtIONet *n, int vid) +{ + n->vlans[vid >> 5] |= (1U << (vid & 0x1f)); +} + +static void vlan_del(VirtIONet *n, int vid) +{ + n->vlans[vid >> 5] &= ~(1U << (vid & 0x1f)); +} + +static bool vlan_is_set(VirtIONet *n, int vid) +{ + return n->vlans[vid >> 5] & ~(1U << (vid & 0x1f)); +} + static void virtio_net_get_config(VirtIODevice *vdev, uint8_t *config) { VirtIONet *n = DO_UPCAST(VirtIONet, vdev, vdev); @@ -306,9 +321,9 @@ static int virtio_net_handle_vlan_table(VirtIONet *n, uint8_t cmd, return VIRTIO_NET_ERR; if (cmd == VIRTIO_NET_CTRL_VLAN_ADD) - n->vlans[vid >> 5] |= (1U << (vid & 0x1f)); + vlan_add(n, vid); else if (cmd == VIRTIO_NET_CTRL_VLAN_DEL) - n->vlans[vid >> 5] &= ~(1U << (vid & 0x1f)); + vlan_del(n, vid); else return VIRTIO_NET_ERR; @@ -471,7 +486,7 @@ static int receive_filter(VirtIONet *n, const uint8_t *buf, int size) if (!memcmp(&ptr[12], vlan, sizeof(vlan))) { int vid = be16_to_cpup((uint16_t *)(ptr + 14)) & 0xfff; - if (!(n->vlans[vid >> 5] & (1U << (vid & 0x1f)))) + if (!vlan_is_set(n, vid)) return 0; } -- 1.6.5.2