Changeset 85698 in vbox for trunk/src/VBox/HostDrivers/VBoxNetAdp/linux

Timestamp:

Aug 11, 2020 5:05:29 PM (5 years ago)

Author:

vboxsync

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

139838

Message:

IPRT,lnx-kmods: Use new linux kernel version checking macros. Moved them to separate wrapper header.

Location:

trunk/src/VBox/HostDrivers/VBoxNetAdp/linux

Files:

• VBoxNetAdp-linux.c (modified) (12 diffs)
• files_vboxnetadp (modified) (1 diff)

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

@@ -76 +76 @@
 static int VBoxNetAdpLinuxOpen(struct inode *pInode, struct file *pFilp);
 static int VBoxNetAdpLinuxClose(struct inode *pInode, struct file *pFilp);
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 36)
+#if RTLNX_VER_MAX(2,6,36)
 static int VBoxNetAdpLinuxIOCtl(struct inode *pInode, struct file *pFilp,
                                 unsigned int uCmd, unsigned long ulArg);
-#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 36) */
+#else  /* >= 2,6,36 */
 static long VBoxNetAdpLinuxIOCtlUnlocked(struct file *pFilp,
                                          unsigned int uCmd, unsigned long ulArg);
-#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 36) */
+#endif /* >= 2,6,36 */
 
 static void vboxNetAdpEthGetDrvinfo(struct net_device *dev, struct ethtool_drvinfo *info);
-# if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 20, 0)
+#if RTLNX_VER_MIN(4,20,0)
 static int vboxNetAdpEthGetLinkSettings(struct net_device *pNetDev, struct ethtool_link_ksettings *pLinkSettings);
-#else /* LINUX_VERSION_CODE < KERNEL_VERSION(4, 20, 0) */
+#else  /* < 4,20,0 */
 static int vboxNetAdpEthGetSettings(struct net_device *dev, struct ethtool_cmd *cmd);
-#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(4, 20, 0) */
+#endif /* < 4,20,0 */
 
 
@@ -113 +113 @@
     open:       VBoxNetAdpLinuxOpen,
     release:    VBoxNetAdpLinuxClose,
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 36)
+#if RTLNX_VER_MAX(2,6,36)
     ioctl:      VBoxNetAdpLinuxIOCtl,
-#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 36) */
+#else /* RTLNX_VER_MIN(2,6,36) */
     unlocked_ioctl: VBoxNetAdpLinuxIOCtlUnlocked,
-#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 36) */
+#endif /* RTLNX_VER_MIN(2,6,36) */
 };
 
@@ -126 +126 @@
     name:       VBOXNETADP_CTL_DEV_NAME,
     fops:       &gFileOpsVBoxNetAdp,
-# if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 17)
+# if RTLNX_VER_MAX(2,6,18)
     devfs_name: VBOXNETADP_CTL_DEV_NAME
 # endif
 };
 
-# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 19)
+# if RTLNX_VER_MIN(2,6,19)
 static const struct ethtool_ops gEthToolOpsVBoxNetAdp =
 # else
@@ -138 +138 @@
 {
     .get_drvinfo        = vboxNetAdpEthGetDrvinfo,
-# if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 20, 0)
+# if RTLNX_VER_MIN(4,20,0)
     .get_link_ksettings = vboxNetAdpEthGetLinkSettings,
-# else /* LINUX_VERSION_CODE < KERNEL_VERSION(4, 20, 0) */
+# else
     .get_settings       = vboxNetAdpEthGetSettings,
-# endif /* LINUX_VERSION_CODE < KERNEL_VERSION(4, 20, 0) */
+# endif
     .get_link           = ethtool_op_get_link,
 };
@@ -174 +174 @@
     pPriv->Stats.tx_packets++;
     pPriv->Stats.tx_bytes += pSkb->len;
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 31)
+#if RTLNX_VER_MAX(2,6,31)
     /* Update transmission time stamp. */
     pNetDev->trans_start = jiffies;
@@ -214 +214 @@
 
 
-# if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 20, 0)
+# if RTLNX_VER_MIN(4,20,0)
 /* ethtool_ops::get_link_ksettings */
 static int vboxNetAdpEthGetLinkSettings(struct net_device *pNetDev, struct ethtool_link_ksettings *pLinkSettings)
@@ -230 +230 @@
     return 0;
 }
-#else /* LINUX_VERSION_CODE < KERNEL_VERSION(4, 20, 0) */
+#else /* RTLNX_VER_MAX(4,20,0) */
 /* ethtool_ops::get_settings */
 static int vboxNetAdpEthGetSettings(struct net_device *pNetDev, struct ethtool_cmd *cmd)
@@ -236 +236 @@
     cmd->supported      = 0;
     cmd->advertising    = 0;
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
+#if RTLNX_VER_MIN(2,6,27)
     ethtool_cmd_speed_set(cmd, SPEED_10);
 #else
@@ -250 +250 @@
     return 0;
 }
-#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(4, 20, 0) */
-
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
+#endif /* RTLNX_VER_MAX(4,20,0) */
+
+
+#if RTLNX_VER_MIN(2,6,29)
 static const struct net_device_ops vboxNetAdpNetdevOps = {
     .ndo_open               = vboxNetAdpLinuxOpen,
@@ -267 +267 @@
 
     ether_setup(pNetDev);
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
+#if RTLNX_VER_MIN(2,6,29)
     pNetDev->netdev_ops = &vboxNetAdpNetdevOps;
-#else /* LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29) */
+#else /* RTLNX_VER_MAX(2,6,29) */
     pNetDev->open = vboxNetAdpLinuxOpen;
     pNetDev->stop = vboxNetAdpLinuxStop;
     pNetDev->hard_start_xmit = vboxNetAdpLinuxXmit;
     pNetDev->get_stats = vboxNetAdpLinuxGetStats;
-#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29) */
+#endif /* RTLNX_VER_MAX(2,6,29) */
 
     pNetDev->ethtool_ops = &gEthToolOpsVBoxNetAdp;
@@ -291 +291 @@
     pNetDev = alloc_netdev(sizeof(VBOXNETADPPRIV),
                            pThis->szName[0] ? pThis->szName : VBOXNETADP_LINUX_NAME,
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 17, 0)
+#if RTLNX_VER_MIN(3,17,0)
                            NET_NAME_UNKNOWN,
 #endif
@@ -391 +391 @@
  * @param   ulArg       The argument specified to ioctl().
  */
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 36)
+#if RTLNX_VER_MAX(2,6,36)
 static int VBoxNetAdpLinuxIOCtl(struct inode *pInode, struct file *pFilp,
                                 unsigned int uCmd, unsigned long ulArg)
-#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 36) */
+#else /* RTLNX_VER_MIN(2,6,36) */
 static long VBoxNetAdpLinuxIOCtlUnlocked(struct file *pFilp,
                                          unsigned int uCmd, unsigned long ulArg)
-#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 36) */
+#endif /* RTLNX_VER_MIN(2,6,36) */
 {
     VBOXNETADPREQ Req;

trunk/src/VBox/HostDrivers/VBoxNetAdp/linux/files_vboxnetadp

@@ -66 +66 @@
     ${PATH_ROOT}/include/iprt/uuid.h=>include/iprt/uuid.h \
     ${PATH_ROOT}/include/iprt/x86.h=>include/iprt/x86.h \
+    ${PATH_ROOT}/include/iprt/linux/version.h=>include/iprt/linux/version.h \
     ${PATH_ROOT}/include/iprt/nocrt/limits.h=>include/iprt/nocrt/limits.h \
     ${PATH_ROOT}/include/VBox/cdefs.h=>include/VBox/cdefs.h \