Changeset 15894 in vbox for trunk

Timestamp:

Jan 12, 2009 2:17:55 PM (16 years ago)

Author:

vboxsync

Message:

Linux vboxnetflt: remove some warnings with older kernels

File:

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

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

@@ -439 +439 @@
  * @param   eProtocol       The protocol.
  */
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 14)
 static int vboxNetFltLinuxPacketHandler(struct sk_buff *pBuf,
                                         struct net_device *pSkbDev,
                                         struct packet_type *pPacketType,
                                         struct net_device *pOrigDev)
+#else
+static int vboxNetFltLinuxPacketHandler(struct sk_buff *pBuf,
+                                        struct net_device *pSkbDev,
+                                        struct packet_type *pPacketType)
+#endif
 {
     PVBOXNETFLTINS pThis;
     struct net_device *pDev;
-    /*
-     * Drop it immediately?
-     */
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 14)
     Log2(("vboxNetFltLinuxPacketHandler: pBuf=%p pSkbDev=%p pPacketType=%p pOrigDev=%p\n",
           pBuf, pSkbDev, pPacketType, pOrigDev));
+#else
+    Log2(("vboxNetFltLinuxPacketHandler: pBuf=%p pSkbDev=%p pPacketType=%p\n",
+          pBuf, pSkbDev, pPacketType));
+#endif
+    /*
+     * Drop it immediately?
+     */
     if (!pBuf)
         return 0;
@@ -587 +598 @@
 }
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 20)
 static void vboxNetFltLinuxXmitTask(struct work_struct *pWork)
+#else
+static void vboxNetFltLinuxXmitTask(void *pWork)
+#endif
 {
     struct sk_buff *pBuf;