From patchwork Wed Dec 2 12:04:25 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 40033 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 23424B7BEB for ; Thu, 3 Dec 2009 01:05:24 +1100 (EST) Received: from localhost ([127.0.0.1]:47518 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NFppZ-0001bO-Ah for incoming@patchwork.ozlabs.org; Wed, 02 Dec 2009 09:05:21 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NFny8-0004Xe-NY for qemu-devel@nongnu.org; Wed, 02 Dec 2009 07:06:04 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NFny4-0004Vr-8b for qemu-devel@nongnu.org; Wed, 02 Dec 2009 07:06:04 -0500 Received: from [199.232.76.173] (port=42937 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NFny3-0004Vk-Pc for qemu-devel@nongnu.org; Wed, 02 Dec 2009 07:05:59 -0500 Received: from mx1.redhat.com ([209.132.183.28]:3059) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NFny3-0004EX-B0 for qemu-devel@nongnu.org; Wed, 02 Dec 2009 07:05:59 -0500 Received: from int-mx03.intmail.prod.int.phx2.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id nB2C5wNJ018261 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 2 Dec 2009 07:05:58 -0500 Received: from localhost.localdomain (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx03.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id nB2C5ILP029769; Wed, 2 Dec 2009 07:05:57 -0500 From: Juan Quintela To: qemu-devel@nongnu.org Date: Wed, 2 Dec 2009 13:04:25 +0100 Message-Id: <0212bb69ec7e94e572f4f0a7d8718a6131e9ceaa.1259754427.git.quintela@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.67 on 10.5.11.16 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: mst@redhat.com Subject: [Qemu-devel] [PATCH 27/41] virtio-net: abstract vlans operations X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Juan Quintela --- 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; }