Changeset 40733 in vbox

Timestamp:

Apr 1, 2012 7:56:35 AM (13 years ago)

Author:

vboxsync

Message:

VBoxNetFlt: 3.4-rc1 support (VLAN_ETH_ALEN -> ETH_ALEN)

File:

• trunk/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c (modified) (1 diff)

trunk/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c

@@ -821 +821 @@
             uint8_t *pMac = (uint8_t*)skb_mac_header(pBuf);
             struct vlan_ethhdr *pVHdr = (struct vlan_ethhdr *)(pMac - VLAN_HLEN);
+#  if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 4, 0)
+            memmove(pVHdr, pMac, ETH_ALEN * 2);
+#  else
             memmove(pVHdr, pMac, VLAN_ETH_ALEN * 2);
+#  endif
             pVHdr->h_vlan_proto = RT_H2N_U16(ETH_P_8021Q);
             pVHdr->h_vlan_TCI   = RT_H2N_U16(vlan_tx_tag_get(pBuf));