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