Changeset 15193 in vbox for trunk/src/VBox/HostDrivers/VBoxNetFlt

Timestamp:

Dec 9, 2008 4:51:30 PM (16 years ago)

Author:

vboxsync

Message:

Linux hostif: hopefully fixed the problem for 64-bit host platforms. Removed some warnings as well.

File:

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

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

@@ -48 +48 @@
 
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 22)
-# define VBOX_SKB_TRANSPORT_HDR(skb) skb->transport_header
-# define VBOX_SKB_NETWORK_HDR(skb) skb->network_header
-# define VBOX_SKB_MAC_HDR(skb) skb->mac_header
+# define VBOX_SKB_RESET_NETWORK_HDR(skb) skb_reset_network_header(skb)
+# define VBOX_SKB_RESET_MAC_HDR(skb) skb_reset_mac_header(skb)
 #else /* LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 22) */
-# define VBOX_SKB_TRANSPORT_HDR(skb) skb->h.raw
-# define VBOX_SKB_NETWORK_HDR(skb) skb->nh.raw
-# define VBOX_SKB_MAC_HDR(skb) skb->mac.raw
+# define VBOX_SKB_RESET_NETWORK_HDR(skb) skb->nh.raw = skb->data
+# define VBOX_SKB_RESET_MAC_HDR(skb) skb->mac.raw = skb->data
 #endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 22) */
 
@@ -313 +311 @@
         if (fDstWire)
         {
-            VBOX_SKB_NETWORK_HDR(pPkt) = pPkt->data;
+            VBOX_SKB_RESET_NETWORK_HDR(pPkt);
             /* Restore ethernet header back. */
             skb_push(pPkt, ETH_HLEN);
         }
+        VBOX_SKB_RESET_MAC_HDR(pPkt);
         VBOXNETFLT_SKB_CB(pPkt) = VBOXNETFLT_CB_TAG;
 
@@ -714 +713 @@
 
 {
-    int rc;
+    int rc = NOTIFY_OK;
 #ifdef DEBUG
     char *pszEvent = "<unknown>";
@@ -884 +883 @@
         if (fActive)
         {
-            int err = 0;
             Assert(!pThis->u.s.fPromiscuousSet);
 
@@ -895 +893 @@
             {
                 rtnl_lock();
-                err = dev_change_flags(pDev, fIf | IFF_UP);
+                int err = dev_change_flags(pDev, fIf | IFF_UP);
                 rtnl_unlock();
                 fIf = dev_get_flags(pDev);