From: Selvin Xavier Date: Sat, 16 Mar 2019 06:53:02 +0000 (-0700) Subject: bnxt_en: Fix bnxt_en compilation for RH 7.6 X-Git-Tag: vofed-4.17-1-rc1^0 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=e91beb020190107b22171455802dd8e09bea65dc;p=compat-rdma%2Fcompat-rdma.git bnxt_en: Fix bnxt_en compilation for RH 7.6 Bug: 2699 Signed-off-by: Selvin Xavier --- diff --git a/patches/0050-bnxt_en-Fix-RH-7.6-compilation-issue.patch b/patches/0050-bnxt_en-Fix-RH-7.6-compilation-issue.patch new file mode 100644 index 0000000..c126f40 --- /dev/null +++ b/patches/0050-bnxt_en-Fix-RH-7.6-compilation-issue.patch @@ -0,0 +1,36 @@ +From e40bbdf2f5e4a4ef71a4034033056e46ec9f6d50 Mon Sep 17 00:00:00 2001 +From: Selvin Xavier +Date: Mon, 11 Mar 2019 13:26:59 -0400 +Subject: [PATCH] bnxt_en: Fix RH 7.6 compilation issue + +Add HAVE_NDO_SETUP_TC check for bnxt_setup_tc + +Signed-off-by: Selvin Xavier +--- + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c +index 1a319fd..6ce60d4 100644 +--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c ++++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c +@@ -8021,6 +8021,7 @@ static int bnxt_setup_flower(struct net_device *dev, + #endif + #endif + ++#ifdef HAVE_NDO_SETUP_TC + #if !defined(HAVE_NDO_SETUP_TC_RH72) + #ifdef HAVE_NDO_SETUP_TC_TAKES_TC_SETUP_TYPE + static int bnxt_setup_tc(struct net_device *dev, enum tc_setup_type type, +@@ -8082,7 +8083,7 @@ static int bnxt_setup_tc(struct net_device *dev, u32 handle, __be16 proto, + #endif /* HAVE_TC_TO_NETDEV_TC */ + #endif /* HAVE_NDO_SETUP_TC_TAKES_TC_SETUP_TYPE */ + #endif /* HAVE_NDO_SETUP_TC_RH72 */ +- ++#endif /* HAVE_NDO_SETUP_TC */ + #ifdef CONFIG_RFS_ACCEL + static bool bnxt_fltr_match(struct bnxt_ntuple_filter *f1, + struct bnxt_ntuple_filter *f2) +-- +1.8.3.1 +