From: Hauke Mehrtens <hauke@hauke-m.de>
To: backports@vger.kernel.org
Cc: johannes@sipsolutions.net, Hauke Mehrtens <hauke@hauke-m.de>
Subject: [PATCH] backports: Do not access rx_count and rx_list attributes
Date: Mon, 27 Jan 2020 00:13:36 +0100 [thread overview]
Message-ID: <20200126231336.2573-1-hauke@hauke-m.de> (raw)
The rx_count and rx_list attributes were only added in kernel 5.4 in
commit 323ebb61e32b ("net: use listified RX for handling GRO_NORMAL skbs")
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
patches/0092-listified-rx/iwlwifi.patch | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
create mode 100644 patches/0092-listified-rx/iwlwifi.patch
diff --git a/patches/0092-listified-rx/iwlwifi.patch b/patches/0092-listified-rx/iwlwifi.patch
new file mode 100644
index 00000000..223629c9
--- /dev/null
+++ b/patches/0092-listified-rx/iwlwifi.patch
@@ -0,0 +1,19 @@
+The rx_count and rx_list attributes wrere only added in kernel 5.4 in
+commit 323ebb61e32b ("net: use listified RX for handling GRO_NORMAL skbs")
+
+--- a/drivers/net/wireless/intel/iwlwifi/pcie/rx.c
++++ b/drivers/net/wireless/intel/iwlwifi/pcie/rx.c
+@@ -1537,11 +1537,13 @@ out:
+
+ napi = &rxq->napi;
+ if (napi->poll) {
++#if LINUX_VERSION_IS_GEQ(5,4,0)
+ if (napi->rx_count) {
+ netif_receive_skb_list(&napi->rx_list);
+ INIT_LIST_HEAD(&napi->rx_list);
+ napi->rx_count = 0;
+ }
++#endif /* >= 5.4 */
+
+ napi_gro_flush(napi, false);
+ }
--
2.20.1
--
To unsubscribe from this list: send the line "unsubscribe backports" in
reply other threads:[~2020-01-26 23:13 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20200126231336.2573-1-hauke@hauke-m.de \
--to=hauke@hauke-m.de \
--cc=backports@vger.kernel.org \
--cc=johannes@sipsolutions.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).