[v19.11,LTS] kni: fix build for Suse

Message ID 20221216121101.3553982-1-ferruh.yigit@amd.com (mailing list archive)
State Not Applicable, archived
Delegated to: David Marchand
Headers
Series [v19.11,LTS] kni: fix build for Suse |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/loongarch-compilation warning apply patch failure
ci/Intel-compilation warning apply issues
ci/iol-testing warning apply patch failure

Commit Message

Ferruh Yigit Dec. 16, 2022, 12:11 p.m. UTC
  Wrong macro is used in the patch that detects if '.ndo_tx_timeout'
has 'txqueue' parameter or not, which is causing build error.

Fixed by using correct macro.

Bugzilla ID: 1141
Fixes: d43fa3e198c0 ("kni: fix build for SLES15-SP3 (Make)")
Cc: stable@dpdk.org

Signed-off-by: Ferruh Yigit <ferruh.yigit@amd.com>
---
Cc: christian.ehrhardt@canonical.com
Cc: Daxue Gao <daxuex.gao@intel.com>
---
 kernel/linux/kni/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
  

Comments

Gao, DaxueX Dec. 19, 2022, 9:04 a.m. UTC | #1
> From: Ferruh Yigit <ferruh.yigit@amd.com>
> Sent: 2022年12月16日 20:11
> To: Thomas Monjalon <thomas@monjalon.net>
> Cc: dev@dpdk.org; David Marchand <david.marchand@redhat.com>;
> stable@dpdk.org; christian.ehrhardt@canonical.com; Gao, DaxueX
> <daxuex.gao@intel.com>
> Subject: [PATCH v19.11 LTS] kni: fix build for Suse
> 
> Wrong macro is used in the patch that detects if '.ndo_tx_timeout'
> has 'txqueue' parameter or not, which is causing build error.
> 
> Fixed by using correct macro.
> 
> Bugzilla ID: 1141
> Fixes: d43fa3e198c0 ("kni: fix build for SLES15-SP3 (Make)")
> Cc: stable@dpdk.org
> 
> Signed-off-by: Ferruh Yigit <ferruh.yigit@amd.com>

Tested-by: Daxue Gao <daxuex.gao@intel.com>
  

Patch

diff --git a/kernel/linux/kni/Makefile b/kernel/linux/kni/Makefile
index bf0efab96b33..d125783213fb 100644
--- a/kernel/linux/kni/Makefile
+++ b/kernel/linux/kni/Makefile
@@ -22,7 +22,7 @@  MODULE_CFLAGS += -Wall -Werror
 ifdef CONFIG_SUSE_KERNEL
    KSRC = /lib/modules/$(shell uname -r)/source
    ifneq ($(shell grep -A 1 "ndo_tx_timeout" $(KSRC)/include/linux/netdevice.h | grep -o txqueue),)
-      MODULE_CFLAGS += -DHAVE_TX_TIMEOUT_TXQUEUE
+      MODULE_CFLAGS += -DHAVE_ARG_TX_QUEUE
    endif
 endif