Commit 559a8f45f34cc50d1a60b4f67a06614d506b2e01
1 parent
4b16eb9d
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
Showing
1 changed file
with
0 additions
and
5 deletions
hw/virtio-net.c
| @@ -338,11 +338,6 @@ static int receive_filter(VirtIONet *n, const uint8_t *buf, int size) | @@ -338,11 +338,6 @@ static int receive_filter(VirtIONet *n, const uint8_t *buf, int size) | ||
| 338 | if (n->promisc) | 338 | if (n->promisc) |
| 339 | return 1; | 339 | return 1; |
| 340 | 340 | ||
| 341 | -#ifdef TAP_VNET_HDR | ||
| 342 | - if (tap_has_vnet_hdr(n->vc->vlan->first_client)) | ||
| 343 | - ptr += sizeof(struct virtio_net_hdr); | ||
| 344 | -#endif | ||
| 345 | - | ||
| 346 | if (!memcmp(&ptr[12], vlan, sizeof(vlan))) { | 341 | if (!memcmp(&ptr[12], vlan, sizeof(vlan))) { |
| 347 | int vid = be16_to_cpup((uint16_t *)(ptr + 14)) & 0xfff; | 342 | int vid = be16_to_cpup((uint16_t *)(ptr + 14)) & 0xfff; |
| 348 | if (!(n->vlans[vid >> 5] & (1U << (vid & 0x1f)))) | 343 | if (!(n->vlans[vid >> 5] & (1U << (vid & 0x1f)))) |