[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] Re: [PATCH 27/41] virtio-net: abstract vlans operations
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] Re: [PATCH 27/41] virtio-net: abstract vlans operations |
Date: |
Wed, 2 Dec 2009 16:49:15 +0200 |
User-agent: |
Mutt/1.5.19 (2009-01-05) |
On Wed, Dec 02, 2009 at 01:04:25PM +0100, Juan Quintela wrote:
>
> Signed-off-by: Juan Quintela <address@hidden>
> ---
> 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));
This one looks wrong. Did you check this does not break vlans?
> +}
> +
> 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
- [Qemu-devel] Re: [PATCH 19/41] virtio: use the right types for VirtQueue elements, (continued)
[Qemu-devel] [PATCH 20/41] virtio: abstract test for save/load values, Juan Quintela, 2009/12/02
[Qemu-devel] [PATCH 22/41] virtio-net: change tx_timer_active to uint32_t, Juan Quintela, 2009/12/02
[Qemu-devel] [PATCH 23/41] virtio-net: change mergeable_rx_bufs to uint32_t, Juan Quintela, 2009/12/02
[Qemu-devel] [PATCH 24/41] virtio-net: use type checking version of qemu_put/get-*, Juan Quintela, 2009/12/02
[Qemu-devel] [PATCH 25/41] virtio-net: MAC_TABLE_ENTRIES has never been bigger, Juan Quintela, 2009/12/02
[Qemu-devel] [PATCH 26/41] virtio-net: we know vlans size at compile time, make it static, Juan Quintela, 2009/12/02
[Qemu-devel] [PATCH 27/41] virtio-net: abstract vlans operations, Juan Quintela, 2009/12/02
- [Qemu-devel] Re: [PATCH 27/41] virtio-net: abstract vlans operations,
Michael S. Tsirkin <=
[Qemu-devel] [PATCH 28/41] virtio-net: make vlan operations on uint8_t, not uint32_t, Juan Quintela, 2009/12/02
[Qemu-devel] [PATCH 29/41] virtio-net: in_use and first_multi only handle unsigned values, Juan Quintela, 2009/12/02