From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id 1435BA0679 for ; Tue, 30 Apr 2019 19:02:48 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 0BE7529CB; Tue, 30 Apr 2019 19:02:48 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 08F9C58CB for ; Tue, 30 Apr 2019 19:02:47 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 61B083097083; Tue, 30 Apr 2019 17:02:46 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-211.ams2.redhat.com [10.36.117.211]) by smtp.corp.redhat.com (Postfix) with ESMTP id D9F506D0AF; Tue, 30 Apr 2019 17:02:44 +0000 (UTC) From: Kevin Traynor To: Ferruh Yigit Cc: Bruce Richardson , Rami Rosen , dpdk stable Date: Tue, 30 Apr 2019 18:01:31 +0100 Message-Id: <20190430170133.2331-36-ktraynor@redhat.com> In-Reply-To: <20190430170133.2331-1-ktraynor@redhat.com> References: <20190430170133.2331-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.43]); Tue, 30 Apr 2019 17:02:46 +0000 (UTC) Subject: [dpdk-stable] patch 'kni: fix build with Linux 5.1' has been queued to LTS release 18.11.2 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to LTS release 18.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/07/19. So please shout if anyone has objections. 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. Queued patches can be viewed on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue.git Thanks. Kevin Traynor --- >From a8e1f16cf7b58229db97eec66d5f668a1c389d8e Mon Sep 17 00:00:00 2001 From: Ferruh Yigit 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 Tested-by: Bruce Richardson Reviewed-by: Rami Rosen --- kernel/linux/kni/ethtool/igb/igb_main.c | 6 ++++++ kernel/linux/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 0b4faeae5..cda2b063d 100644 --- a/kernel/linux/kni/ethtool/igb/igb_main.c +++ b/kernel/linux/kni/ethtool/igb/igb_main.c @@ -2113,5 +2113,11 @@ static int igb_ndo_fdb_add(struct ndmsg *ndm, struct nlattr *tb[], 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, diff --git a/kernel/linux/kni/ethtool/igb/kcompat.h b/kernel/linux/kni/ethtool/igb/kcompat.h index 11b15f3a9..649a69c81 100644 --- a/kernel/linux/kni/ethtool/igb/kcompat.h +++ b/kernel/linux/kni/ethtool/igb/kcompat.h @@ -3946,4 +3946,8 @@ skb_set_hash(struct sk_buff *skb, __u32 hash, __always_unused int type) #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 -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-04-30 17:58:15.507438798 +0100 +++ 0036-kni-fix-build-with-Linux-5.1.patch 2019-04-30 17:58:13.831139288 +0100 @@ -1 +1 @@ -From db9178c24c1643b5ef58f2a9ff87c3eef8e0e1e4 Mon Sep 17 00:00:00 2001 +From a8e1f16cf7b58229db97eec66d5f668a1c389d8e Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit db9178c24c1643b5ef58f2a9ff87c3eef8e0e1e4 ] + @@ -22,2 +23,0 @@ - -Cc: stable@dpdk.org