From: Christian Ehrhardt <christian.ehrhardt@canonical.com>
To: dev <dev@dpdk.org>, Ferruh Yigit <ferruh.yigit@intel.com>
Cc: Thomas Monjalon <thomas@monjalon.net>,
Christian Ehrhardt <christian.ehrhardt@canonical.com>,
stable@dpdk.org
Subject: [dpdk-dev] [PATCH] kni: fix compilation on SLES15-SP3
Date: Wed, 2 Jun 2021 16:33:17 +0200 [thread overview]
Message-ID: <20210602143317.2333707-1-christian.ehrhardt@canonical.com> (raw)
Like what was done for mainline kernel in commit 38ad54f3bc76 ("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:
commit c3bf155c40e9db722feb8a08c19efd44c12d5294
Author: Thomas Bogendoerfer <tbogendoerfer@suse.de>
Date: Fri Sep 11 16:08:31 2020 +0200
- netdev: pass the stuck queue to the timeout handler
(jsc#SLE-13536).
- Refresh patches.suse/sfc-move-various-functions.patch.
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>
---
kernel/linux/kni/compat.h | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/kernel/linux/kni/compat.h b/kernel/linux/kni/compat.h
index 5f65640d5ed..70e014fd1da 100644
--- a/kernel/linux/kni/compat.h
+++ b/kernel/linux/kni/compat.h
@@ -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) || \
+ (defined(CONFIG_SUSE_KERNEL) && \
+ KERNEL_VERSION(5, 3, 18) <= LINUX_VERSION_CODE)
#define HAVE_TX_TIMEOUT_TXQUEUE
#endif
--
2.31.1
next reply other threads:[~2021-06-02 14:33 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-02 14:33 Christian Ehrhardt [this message]
2021-06-04 13:02 ` Luca Boccassi
2021-06-08 11:17 ` Ferruh Yigit
2021-06-10 8:39 ` Christian Ehrhardt
2021-06-10 10:30 ` Christian Ehrhardt
2021-06-17 6:14 ` Christian Ehrhardt
2021-06-17 6:41 ` Thomas Monjalon
2021-06-17 8:24 ` Marco Varlese
2021-07-01 8:23 ` Christian Ehrhardt
2021-07-01 13:24 ` Christian Ehrhardt
2021-10-25 19:59 ` [dpdk-dev] [dpdk-stable] " Thomas Monjalon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210602143317.2333707-1-christian.ehrhardt@canonical.com \
--to=christian.ehrhardt@canonical.com \
--cc=dev@dpdk.org \
--cc=ferruh.yigit@intel.com \
--cc=stable@dpdk.org \
--cc=thomas@monjalon.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).