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

Timestamp:

Aug 11, 2020 5:46:17 PM (5 years ago)

Author:

vboxsync

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

139841

Message:

IPRT,lnx-kmods: Added VBOX_RHEL_MAJ_PREREQ and RTLNX_SUSE_MAJ_PREREQ to version.h. Started using them.

File:

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

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

@@ -206 +206 @@
  * GRO support was backported to RHEL 5.4
  */
-#ifdef RHEL_RELEASE_CODE
-# if RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(5, 4)
-#  define VBOXNETFLT_WITH_GRO               1
-# endif
-#endif
-
-#if defined(CONFIG_SUSE_VERSION)
-# if CONFIG_SUSE_VERSION == 15 && CONFIG_SUSE_PATCHLEVEL == 2
-#  define OPENSUSE_152
-# endif
+#if RTLNX_RHEL_MAJ_PREREQ(5, 4)
+# define VBOXNETFLT_WITH_GRO                1
 #endif
 
@@ -929 +921 @@
     {
         skb_frag_t *pFrag = &skb_shinfo(pBuf)->frags[i];
-# if RTLNX_VER_MIN(5,4,0) || defined(OPENSUSE_152)
+# if RTLNX_VER_MIN(5,4,0) || RTLNX_SUSE_MAJ_PREREQ(15, 2)
         pSG->aSegs[iSeg].cb = pFrag->bv_len;
         pSG->aSegs[iSeg].pv = VBOX_SKB_KMAP_FRAG(pFrag) + pFrag->bv_offset;
@@ -950 +942 @@
         {
             skb_frag_t *pFrag = &skb_shinfo(pFragBuf)->frags[i];
-# if RTLNX_VER_MIN(5,4,0) || defined(OPENSUSE_152)
+# if RTLNX_VER_MIN(5,4,0) || RTLNX_SUSE_MAJ_PREREQ(15, 2)
             pSG->aSegs[iSeg].cb = pFrag->bv_len;
             pSG->aSegs[iSeg].pv = VBOX_SKB_KMAP_FRAG(pFrag) + pFrag->bv_offset;