aboutsummaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authoraliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162>2009-04-17 17:10:34 +0000
committeraliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162>2009-04-17 17:10:34 +0000
commit559a8f45f34cc50d1a60b4f67a06614d506b2e01 (patch)
tree3a065da12e185f4cf3c840192b5cbe40f77b47a0 /hw
parent4b16eb9d9570c9b311d514b840eb51b25fcc21a1 (diff)
downloadqemu-559a8f45f34cc50d1a60b4f67a06614d506b2e01.zip
qemu-559a8f45f34cc50d1a60b4f67a06614d506b2e01.tar.gz
qemu-559a8f45f34cc50d1a60b4f67a06614d506b2e01.tar.bz2
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
Diffstat (limited to 'hw')
-rw-r--r--hw/virtio-net.c5
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))))