Changeset 58656 in vbox for trunk/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c

Timestamp:

Nov 11, 2015 5:28:31 AM (9 years ago)

Author:

vboxsync

Message:

VBoxNetFlt/linux: vboxNetFltLinuxPacketHandler - there's no need to
duplicate the statement that only differs in ETH_ALEN vs VLAN_ETH_ALEN
The former is always defined, so just g/c the moribund version.

File:

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

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

@@ -930 +930 @@
             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));