Skip to content

Commit

Permalink
kni: fix compilation on SLES15-SP3
Browse files Browse the repository at this point in the history
Like what was done for mainline kernel in commit 38ad54f ("kni: fix
build with Linux 5.6"), a new parameter 'txqueue' has to be added to
'ndo_tx_timeout' ndo on SLES 15-SP3 kernel.

Caused by (SLES) kernel backport c3bf155c40e9 ("netdev: pass the stuck
queue to the timeout handler (jsc#SLE-13536).")
That is part of the SLES 5.3.18 kernel and therefore the version we
check for.

Cc: stable@dpdk.org

Signed-off-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
  • Loading branch information
cpaelzer committed Jun 10, 2021
1 parent d1610c3 commit 43b908f
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion kernel/linux/kni/compat.h
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,9 @@

#if KERNEL_VERSION(5, 6, 0) <= LINUX_VERSION_CODE || \
(defined(RHEL_RELEASE_CODE) && \
RHEL_RELEASE_VERSION(8, 3) <= RHEL_RELEASE_CODE)
RHEL_RELEASE_VERSION(8, 3) <= RHEL_RELEASE_CODE) || \
(SLE_VERSION_CODE >= SLE_VERSION(15, 3, 0) && \
KERNEL_VERSION(5, 3, 18) <= LINUX_VERSION_CODE)
#define HAVE_TX_TIMEOUT_TXQUEUE
#endif

Expand Down

0 comments on commit 43b908f

Please sign in to comment.