From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54392) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WSmrV-00049T-9v for qemu-devel@nongnu.org; Wed, 26 Mar 2014 08:23:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WSmrQ-00017a-9U for qemu-devel@nongnu.org; Wed, 26 Mar 2014 08:23:17 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44933) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WSmrQ-00017V-1A for qemu-devel@nongnu.org; Wed, 26 Mar 2014 08:23:12 -0400 Date: Wed, 26 Mar 2014 14:23:18 +0200 From: "Michael S. Tsirkin" Message-ID: <1395831215-5985-4-git-send-email-mst@redhat.com> References: <1395831215-5985-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1395831215-5985-1-git-send-email-mst@redhat.com> Subject: [Qemu-devel] [PULL for-2.0 3/4] virtio-net: Do not filter VLANs without F_CTRL_VLAN List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Amos Kong , Stefan Fritsch , Anthony Liguori From: Stefan Fritsch If VIRTIO_NET_F_CTRL_VLAN is not negotiated, do not filter out all VLAN-tagged packets but send them to the guest. This fixes VLANs with OpenBSD guests (and probably NetBSD, too, because the OpenBSD driver started as a port from NetBSD). Signed-off-by: Stefan Fritsch Signed-off-by: Amos Kong Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- hw/net/virtio-net.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index fd23c46..33fb799 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -514,6 +514,12 @@ static void virtio_net_set_features(VirtIODevice *vdev, uint32_t features) } vhost_net_ack_features(tap_get_vhost_net(nc->peer), features); } + + if ((1 << VIRTIO_NET_F_CTRL_VLAN) & features) { + memset(n->vlans, 0, MAX_VLAN >> 3); + } else { + memset(n->vlans, 0xff, MAX_VLAN >> 3); + } } static int virtio_net_handle_rx_mode(VirtIONet *n, uint8_t cmd, -- MST