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

Timestamp:

Dec 14, 2010 11:37:21 AM (14 years ago)

Author:

vboxsync

Message:

VBoxNetFlt/linux: Linux 2.6.37rc compile fix for DEBUG builds

File:

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

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

@@ -1006 +1006 @@
         {
             dev_hold(pDev);
-            Log(("vboxNetFltLinuxRetainNetDev: Device %p(%s) retained. ref=%d\n", pDev, pDev->name, atomic_read(&pDev->refcnt)));
+            Log(("vboxNetFltLinuxRetainNetDev: Device %p(%s) retained. ref=%d\n",
+                 pDev, pDev->name,
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)
+                 netdev_refcnt_read(pDev)
+#else
+                 atomic_read(&pDev->refcnt)
+#endif
+                 ));
         }
     }
@@ -1035 +1042 @@
     {
         dev_put(pDev);
-        Log(("vboxNetFltLinuxReleaseNetDev: Device %p(%s) released. ref=%d\n", pDev, pDev->name, atomic_read(&pDev->refcnt)));
+        Log(("vboxNetFltLinuxReleaseNetDev: Device %p(%s) released. ref=%d\n",
+             pDev, pDev->name,
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)
+             netdev_refcnt_read(pDev)
+#else
+             atomic_read(&pDev->refcnt)
+#endif
+             ));
     }
     Log(("vboxNetFltLinuxReleaseNetDev - done\n"));
@@ -1978 +1992 @@
     RTSpinlockReleaseNoInts(pThis->hSpinlock, &Tmp);
 
-    Log(("vboxNetFltLinuxAttachToInterface: Device %p(%s) retained. ref=%d\n", pDev, pDev->name, atomic_read(&pDev->refcnt)));
-    Log(("vboxNetFltLinuxAttachToInterface: Got pDev=%p pThis=%p pThis->u.s.pDev=%p\n", pDev, pThis, ASMAtomicUoReadPtrT(&pThis->u.s.pDev, struct net_device *)));
+    Log(("vboxNetFltLinuxAttachToInterface: Device %p(%s) retained. ref=%d\n",
+          pDev, pDev->name,
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)
+          netdev_refcnt_read(pDev)
+#else
+          atomic_read(&pDev->refcnt)
+#endif
+          ));
+    Log(("vboxNetFltLinuxAttachToInterface: Got pDev=%p pThis=%p pThis->u.s.pDev=%p\n",
+          pDev, pThis, ASMAtomicUoReadPtrT(&pThis->u.s.pDev, struct net_device *)));
 
     /* Get the mac address while we still have a valid net_device reference. */
@@ -2048 +2070 @@
         RTSpinlockReleaseNoInts(pThis->hSpinlock, &Tmp);
         dev_put(pDev);
-        Log(("vboxNetFltLinuxAttachToInterface: Device %p(%s) released. ref=%d\n", pDev, pDev->name, atomic_read(&pDev->refcnt)));
+        Log(("vboxNetFltLinuxAttachToInterface: Device %p(%s) released. ref=%d\n",
+             pDev, pDev->name,
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)
+             netdev_refcnt_read(pDev)
+#else
+             atomic_read(&pDev->refcnt)
+#endif
+             ));
     }
 
@@ -2080 +2109 @@
 #endif
     Log(("vboxNetFltLinuxUnregisterDevice: this=%p: Packet handler removed, xmit queue purged.\n", pThis));
-    Log(("vboxNetFltLinuxUnregisterDevice: Device %p(%s) released. ref=%d\n", pDev, pDev->name, atomic_read(&pDev->refcnt)));
+    Log(("vboxNetFltLinuxUnregisterDevice: Device %p(%s) released. ref=%d\n",
+         pDev, pDev->name,
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)
+         netdev_refcnt_read(pDev)
+#else
+         atomic_read(&pDev->refcnt)
+#endif
+         ));
     dev_put(pDev);
 
@@ -2383 +2419 @@
 #endif
         Log(("vboxNetFltOsDeleteInstance: this=%p: Packet handler removed, xmit queue purged.\n", pThis));
-        Log(("vboxNetFltOsDeleteInstance: Device %p(%s) released. ref=%d\n", pDev, pDev->name, atomic_read(&pDev->refcnt)));
+        Log(("vboxNetFltOsDeleteInstance: Device %p(%s) released. ref=%d\n",
+             pDev, pDev->name,
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)
+             netdev_refcnt_read(pDev)
+#else
+             atomic_read(&pDev->refcnt)
+#endif
+             ));
         dev_put(pDev);
     }