From: aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162>
Date: Fri, 17 Apr 2009 17:10:34 +0000 (+0000)
Subject: Remove stray GSO code from virtio_net (Mark McLoughlin)
X-Git-Tag: TizenStudio_2.0_p2.3~9143
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bd5456f5862e2539ae87c25c21f1915a151ad646;p=sdk%2Femulator%2Fqemu.git

Remove stray GSO code from virtio_net (Mark McLoughlin)

Obviously merged from kvm-userspace accidentally.

Signed-off-by: Mark McLoughlin <markmc@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@7142 c046a42c-6fe2-441c-8c8c-71466251a162
---

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))))