Changeset 39479 in vbox for trunk/src/VBox/HostDrivers/VBoxNetFlt/linux

Timestamp:

Nov 30, 2011 5:07:23 PM (13 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

75134

Message:

NetFlt: Restore VLAN tags stripped by hardware (#4806)

File:

• trunk/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c (modified) (4 diffs)

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

@@ -29 +29 @@
 #include <linux/miscdevice.h>
 #include <linux/ip.h>
+#include <linux/if_vlan.h>
 
 #include <VBox/log.h>
@@ -803 +804 @@
          * Get rid of fragmented packets, they cause too much trouble.
          */
+        unsigned int uMacLen = pBuf->mac_len;
         struct sk_buff *pCopy = skb_copy(pBuf, GFP_ATOMIC);
         kfree_skb(pBuf);
@@ -811 +813 @@
         }
         pBuf = pCopy;
+        /* Somehow skb_copy ignores mac_len */
+        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)
+        {
+            uint8_t *pMac = (uint8_t*)skb_mac_header(pBuf);
+            struct vlan_ethhdr *pVHdr = (struct vlan_ethhdr *)(pMac - VLAN_HLEN);
+            memmove(pVHdr, pMac, VLAN_ETH_ALEN * 2);
+            pVHdr->h_vlan_proto = RT_H2N_U16(ETH_P_8021Q);
+            pVHdr->h_vlan_TCI   = RT_H2N_U16(vlan_tx_tag_get(pBuf));
+            pBuf->mac_header   -= VLAN_HLEN;
+            pBuf->mac_len      += VLAN_HLEN;
+        }
+# endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27) */
+
 # if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 18)
         Log3(("vboxNetFltLinuxPacketHandler: skb copy len=%u data_len=%u truesize=%u next=%p nr_frags=%u gso_size=%u gso_seqs=%u gso_type=%x frag_list=%p pkt_type=%x\n",
@@ -1204 +1222 @@
                 /*
                  * The packet came from wire, ethernet header was removed by device driver.
-                 * Restore it.
+                 * Restore it using mac_len field. This takes into account VLAN headers too.
                  */
-                skb_push(pBuf, ETH_HLEN);
+                skb_push(pBuf, pBuf->mac_len);
             }