[dpdk-stable] patch 'kni: fix build on RHEL 8' has been queued to LTS release 17.11.6

[Yongseok Koh <yskoh@mellanox.com>]

Hi,

FYI, your patch has been queued to LTS release 17.11.6

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objection by 03/13/19. So please
shout if anyone has objection.

Also note that after the patch there's a diff of the upstream commit vs the patch applied
to the branch. If the code is different (ie: not only metadata diffs), due for example to
a change in context or macro names, please double check it.

Thanks.

Yongseok

---
>From f3389b16062d92a27d5a49b5ff59ade99e3c8ac1 Mon Sep 17 00:00:00 2001
From: Xiao Liang <xiliang@redhat.com>
Date: Wed, 19 Dec 2018 15:07:58 +0800
Subject: [PATCH] kni: fix build on RHEL 8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[ upstream commit 4c820b22c08dea1ff6cd5db8b5a17b6568fcc4a5 ]

'ndo_change_mtu_rh74' was changed to 'ndo_change_mtu' in RHEL8.

Build error log:
/home/dpdk-18.11/kernel/linux/kni/compat.h:107:24: error: ‘const struct
net_device_ops’ has no member named ‘ndo_change_mtu_rh74’; did you mean
‘ndo_change_mtu’?
 #define ndo_change_mtu ndo_change_mtu_rh74
                        ^~~~~~~~~~~~~~~~~~~

Signed-off-by: Xiao Liang <xiliang@redhat.com>
Acked-by: Ferruh Yigit <ferruh.yigit@intel.com>
---
 lib/librte_eal/linuxapp/kni/compat.h              | 3 ++-
 lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/librte_eal/linuxapp/kni/compat.h b/lib/librte_eal/linuxapp/kni/compat.h
index 6a6968d93..87d228e53 100644
--- a/lib/librte_eal/linuxapp/kni/compat.h
+++ b/lib/librte_eal/linuxapp/kni/compat.h
@@ -102,7 +102,8 @@
 #endif
 
 #if (defined(RHEL_RELEASE_CODE) && \
-	(RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(7, 5)))
+	(RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(7, 5)) && \
+	(RHEL_RELEASE_CODE < RHEL_RELEASE_VERSION(8, 0)))
 #define ndo_change_mtu ndo_change_mtu_rh74
 #endif
 
diff --git a/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h b/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h
index 6b738911f..214cc1531 100644
--- a/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h
+++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h
@@ -3945,7 +3945,8 @@ skb_set_hash(struct sk_buff *skb, __u32 hash, __always_unused int type)
 #endif
 
 #if (defined(RHEL_RELEASE_CODE) && \
-	(RHEL_RELEASE_VERSION(7, 5) <= RHEL_RELEASE_CODE))
+	(RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(7, 5)) && \
+	(RHEL_RELEASE_CODE < RHEL_RELEASE_VERSION(8, 0)))
 #define ndo_change_mtu ndo_change_mtu_rh74
 #endif
 
-- 
2.11.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-03-08 09:46:41.798701323 -0800
+++ 0030-kni-fix-build-on-RHEL-8.patch	2019-03-08 09:46:40.124400000 -0800
@@ -1,4 +1,4 @@
-From 4c820b22c08dea1ff6cd5db8b5a17b6568fcc4a5 Mon Sep 17 00:00:00 2001
+From f3389b16062d92a27d5a49b5ff59ade99e3c8ac1 Mon Sep 17 00:00:00 2001
 From: Xiao Liang <xiliang@redhat.com>
 Date: Wed, 19 Dec 2018 15:07:58 +0800
 Subject: [PATCH] kni: fix build on RHEL 8
@@ -6,6 +6,8 @@
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 
+[ upstream commit 4c820b22c08dea1ff6cd5db8b5a17b6568fcc4a5 ]
+
 'ndo_change_mtu_rh74' was changed to 'ndo_change_mtu' in RHEL8.
 
 Build error log:
@@ -15,20 +17,18 @@
  #define ndo_change_mtu ndo_change_mtu_rh74
                         ^~~~~~~~~~~~~~~~~~~
 
-Cc: stable@dpdk.org
-
 Signed-off-by: Xiao Liang <xiliang@redhat.com>
 Acked-by: Ferruh Yigit <ferruh.yigit@intel.com>
 ---
- kernel/linux/kni/compat.h              | 3 ++-
- kernel/linux/kni/ethtool/igb/kcompat.h | 3 ++-
+ lib/librte_eal/linuxapp/kni/compat.h              | 3 ++-
+ lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h | 3 ++-
  2 files changed, 4 insertions(+), 2 deletions(-)
 
-diff --git a/kernel/linux/kni/compat.h b/kernel/linux/kni/compat.h
-index 5aadebbcd..bc81d0c8d 100644
---- a/kernel/linux/kni/compat.h
-+++ b/kernel/linux/kni/compat.h
-@@ -103,7 +103,8 @@
+diff --git a/lib/librte_eal/linuxapp/kni/compat.h b/lib/librte_eal/linuxapp/kni/compat.h
+index 6a6968d93..87d228e53 100644
+--- a/lib/librte_eal/linuxapp/kni/compat.h
++++ b/lib/librte_eal/linuxapp/kni/compat.h
+@@ -102,7 +102,8 @@
  #endif
  
  #if (defined(RHEL_RELEASE_CODE) && \
@@ -38,11 +38,11 @@
  #define ndo_change_mtu ndo_change_mtu_rh74
  #endif
  
-diff --git a/kernel/linux/kni/ethtool/igb/kcompat.h b/kernel/linux/kni/ethtool/igb/kcompat.h
-index ae1b53093..2681be684 100644
---- a/kernel/linux/kni/ethtool/igb/kcompat.h
-+++ b/kernel/linux/kni/ethtool/igb/kcompat.h
-@@ -3930,7 +3930,8 @@ skb_set_hash(struct sk_buff *skb, __u32 hash, __always_unused int type)
+diff --git a/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h b/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h
+index 6b738911f..214cc1531 100644
+--- a/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h
++++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h
+@@ -3945,7 +3945,8 @@ skb_set_hash(struct sk_buff *skb, __u32 hash, __always_unused int type)
  #endif
  
  #if (defined(RHEL_RELEASE_CODE) && \