From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Lu7zY-0008K3-7g for qemu-devel@nongnu.org; Wed, 15 Apr 2009 12:29:41 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Lu7zS-0008GR-5I for qemu-devel@nongnu.org; Wed, 15 Apr 2009 12:29:38 -0400 Received: from [199.232.76.173] (port=54432 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Lu7zR-0008Fa-Gm for qemu-devel@nongnu.org; Wed, 15 Apr 2009 12:29:33 -0400 Received: from mail25.svc.cra.dublin.eircom.net ([159.134.118.54]:39513) by monty-python.gnu.org with smtp (Exim 4.60) (envelope-from ) id 1Lu7zQ-00062F-KB for qemu-devel@nongnu.org; Wed, 15 Apr 2009 12:29:33 -0400 From: Mark McLoughlin Date: Wed, 15 Apr 2009 17:29:21 +0100 Message-Id: <1239812969-8320-2-git-send-email-markmc@redhat.com> In-Reply-To: <1239812969-8320-1-git-send-email-markmc@redhat.com> References: <1239812969-8320-1-git-send-email-markmc@redhat.com> Subject: [Qemu-devel] [PATCH 1/9] Remove stray GSO code from virtio_net Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori Cc: Jan Kiszka , qemu-devel@nongnu.org, Mark McLoughlin Obviously merged from kvm-userspace accidentally. Signed-off-by: Mark McLoughlin --- hw/virtio-net.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/hw/virtio-net.c b/hw/virtio-net.c index 88ec1ac..5e7db0d 100644 --- a/hw/virtio-net.c +++ b/hw/virtio-net.c @@ -338,11 +338,6 @@ static int receive_filter(VirtIONet *n, const uint8_t *buf, int size) if (n->promisc) return 1; -#ifdef TAP_VNET_HDR - if (tap_has_vnet_hdr(n->vc->vlan->first_client)) - ptr += sizeof(struct virtio_net_hdr); -#endif - 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)))) -- 1.6.0.6