[patch] patch for Linux 4.0.0-rc1

virtualbox-modules-4.3.20-linux4.patch (text/plain), 1.00 KB, created by Helmut Jarausch on 2015-02-23 12:17:17 UTC

--- vboxnetflt/linux/VBoxNetFlt-linux.c.ORIG	2014-10-10 10:00:57.000000000 +0200
+++ vboxnetflt/linux/VBoxNetFlt-linux.c	2015-02-23 12:32:43.967823974 +0100
@@ -889,7 +889,7 @@
         pBuf->mac_len = uMacLen;
 # if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
         /* Restore VLAN tag stripped by host hardware */
-        if (vlan_tx_tag_present(pBuf) && skb_headroom(pBuf) >= VLAN_ETH_HLEN)
+        if (skb_vlan_tag_present(pBuf) && skb_headroom(pBuf) >= VLAN_ETH_HLEN)
         {
             uint8_t *pMac = (uint8_t*)skb_mac_header(pBuf);
             struct vlan_ethhdr *pVHdr = (struct vlan_ethhdr *)(pMac - VLAN_HLEN);
@@ -899,7 +899,7 @@
             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));
+            pVHdr->h_vlan_TCI   = RT_H2N_U16(skb_vlan_tag_get(pBuf));
             pBuf->mac_header   -= VLAN_HLEN;
             pBuf->mac_len      += VLAN_HLEN;
         }