[dpdk-stable] patch 'kni: fix build with Linux 5.1' has been queued to LTS release 17.11.7

[Yongseok Koh]

Hi,

FYI, your patch has been queued to LTS release 17.11.7

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objection by 07/27/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. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Thanks.

Yongseok

---
>From 6d9f117716d2cc2e63589a93161e49a9bb008551 Mon Sep 17 00:00:00 2001
From: Ferruh Yigit <ferruh.yigit at intel.com>
Date: Mon, 8 Apr 2019 15:22:26 +0100
Subject: [PATCH] kni: fix build with Linux 5.1

[ upstream commit db9178c24c1643b5ef58f2a9ff87c3eef8e0e1e4 ]

Build error seen with Linux kernel 5.1 and
when CONFIG_RTE_KNI_KMOD_ETHTOOL is enabled.

Build error:
kernel/linux/kni/igb_main.c:2352:18:
  error: initialization of ... from incompatible pointer type ...
  [-Werror=incompatible-pointer-types]
    .ndo_fdb_add  = igb_ndo_fdb_add,
                      ^~~~~~~~~~~~~~~

ndo_fdb_add() is changed in Linux kernel version 5.1 and now requires
a new parameter, 'struct netlink_ext_ack *extack':
Linux Commit 87b0984ebfab ("net: Add extack argument to ndo_fdb_add()")

ndo_fdb_add() parameter updated with compile time Linux kernel version
check.

Signed-off-by: Ferruh Yigit <ferruh.yigit at intel.com>
Tested-by: Bruce Richardson <bruce.richardson at intel.com>
Reviewed-by: Rami Rosen <ramirose at gmail.com>
---
 lib/librte_eal/linuxapp/kni/ethtool/igb/igb_main.c | 6 ++++++
 lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h  | 4 ++++
 2 files changed, 10 insertions(+)

diff --git a/lib/librte_eal/linuxapp/kni/ethtool/igb/igb_main.c b/lib/librte_eal/linuxapp/kni/ethtool/igb/igb_main.c
index 6d8c2c774e..a1d9a73615 100644
--- a/lib/librte_eal/linuxapp/kni/ethtool/igb/igb_main.c
+++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/igb_main.c
@@ -2127,7 +2127,13 @@ static int igb_ndo_fdb_add(struct ndmsg *ndm, struct nlattr *tb[],
 #ifdef HAVE_NDO_FDB_ADD_VID
 			   u16 vid,
 #endif
+#ifdef HAVE_NDO_FDB_ADD_EXTACK
+			   u16 flags,
+			   struct netlink_ext_ack *extack)
+#else
 			   u16 flags)
+#endif
+
 #else
 static int igb_ndo_fdb_add(struct ndmsg *ndm,
 			   struct net_device *dev,
diff --git a/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h b/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h
index 0ca7a22a81..8153ecf17f 100644
--- a/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h
+++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h
@@ -3960,6 +3960,10 @@ skb_set_hash(struct sk_buff *skb, __u32 hash, __always_unused int type)
 #define HAVE_NDO_BRIDGE_SETLINK_EXTACK
 #endif /* >= 5.0.0 */
 
+#if ( LINUX_VERSION_CODE >= KERNEL_VERSION(5,1,0) )
+#define HAVE_NDO_FDB_ADD_EXTACK
+#endif /* >= 5.1.0 */
+
 #if defined(timer_setup) && defined(from_timer)
 #define HAVE_TIMER_SETUP
 #endif
-- 
2.21.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-07-22 17:55:10.601235503 -0700
+++ 0077-kni-fix-build-with-Linux-5.1.patch	2019-07-22 17:55:06.288473000 -0700
@@ -1,8 +1,10 @@
-From db9178c24c1643b5ef58f2a9ff87c3eef8e0e1e4 Mon Sep 17 00:00:00 2001
+From 6d9f117716d2cc2e63589a93161e49a9bb008551 Mon Sep 17 00:00:00 2001
 From: Ferruh Yigit <ferruh.yigit at intel.com>
 Date: Mon, 8 Apr 2019 15:22:26 +0100
 Subject: [PATCH] kni: fix build with Linux 5.1
 
+[ upstream commit db9178c24c1643b5ef58f2a9ff87c3eef8e0e1e4 ]
+
 Build error seen with Linux kernel 5.1 and
 when CONFIG_RTE_KNI_KMOD_ETHTOOL is enabled.
 
@@ -20,21 +22,19 @@
 ndo_fdb_add() parameter updated with compile time Linux kernel version
 check.
 
-Cc: stable at dpdk.org
-
 Signed-off-by: Ferruh Yigit <ferruh.yigit at intel.com>
 Tested-by: Bruce Richardson <bruce.richardson at intel.com>
 Reviewed-by: Rami Rosen <ramirose at gmail.com>
 ---
- kernel/linux/kni/ethtool/igb/igb_main.c | 6 ++++++
- kernel/linux/kni/ethtool/igb/kcompat.h  | 4 ++++
+ lib/librte_eal/linuxapp/kni/ethtool/igb/igb_main.c | 6 ++++++
+ lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h  | 4 ++++
  2 files changed, 10 insertions(+)
 
-diff --git a/kernel/linux/kni/ethtool/igb/igb_main.c b/kernel/linux/kni/ethtool/igb/igb_main.c
-index 0b4faeae52..cda2b063d8 100644
---- a/kernel/linux/kni/ethtool/igb/igb_main.c
-+++ b/kernel/linux/kni/ethtool/igb/igb_main.c
-@@ -2112,7 +2112,13 @@ static int igb_ndo_fdb_add(struct ndmsg *ndm, struct nlattr *tb[],
+diff --git a/lib/librte_eal/linuxapp/kni/ethtool/igb/igb_main.c b/lib/librte_eal/linuxapp/kni/ethtool/igb/igb_main.c
+index 6d8c2c774e..a1d9a73615 100644
+--- a/lib/librte_eal/linuxapp/kni/ethtool/igb/igb_main.c
++++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/igb_main.c
+@@ -2127,7 +2127,13 @@ static int igb_ndo_fdb_add(struct ndmsg *ndm, struct nlattr *tb[],
  #ifdef HAVE_NDO_FDB_ADD_VID
  			   u16 vid,
  #endif
@@ -48,11 +48,11 @@
  #else
  static int igb_ndo_fdb_add(struct ndmsg *ndm,
  			   struct net_device *dev,
-diff --git a/kernel/linux/kni/ethtool/igb/kcompat.h b/kernel/linux/kni/ethtool/igb/kcompat.h
-index 11b15f3a99..649a69c814 100644
---- a/kernel/linux/kni/ethtool/igb/kcompat.h
-+++ b/kernel/linux/kni/ethtool/igb/kcompat.h
-@@ -3945,6 +3945,10 @@ 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 0ca7a22a81..8153ecf17f 100644
+--- a/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h
++++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h
+@@ -3960,6 +3960,10 @@ skb_set_hash(struct sk_buff *skb, __u32 hash, __always_unused int type)
  #define HAVE_NDO_BRIDGE_SETLINK_EXTACK
  #endif /* >= 5.0.0 */