From: Johannes Berg <johannes@sipsolutions.net>
To: backports@vger.kernel.org
Cc: Hauke Mehrtens <hauke@hauke-m.de>
Subject: [PATCH 05/15] backports: Do not access rx_count and rx_list attributes
Date: Fri, 21 Feb 2020 09:56:14 +0100 [thread overview]
Message-ID: <20200221085624.6213-3-johannes@sipsolutions.net> (raw)
In-Reply-To: <20200221085624.6213-1-johannes@sipsolutions.net>
From: Hauke Mehrtens <hauke@hauke-m.de>
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>
Link: https://lore.kernel.org/r/20200126231336.2573-1-hauke@hauke-m.de
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---
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 000000000000..925010fd5a5c
--- /dev/null
+++ b/patches/0092-listified-rx/iwlwifi.patch
@@ -0,0 +1,19 @@
+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")
+
+--- a/drivers/net/wireless/intel/iwlwifi/pcie/rx.c
++++ b/drivers/net/wireless/intel/iwlwifi/pcie/rx.c
+@@ -1531,11 +1531,13 @@ out:
+ if (napi->poll) {
+ napi_gro_flush(napi, false);
+
++#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
+ }
+
+ iwl_pcie_rxq_restock(trans, rxq);
--
2.24.1
--
To unsubscribe from this list: send the line "unsubscribe backports" in
next prev parent reply other threads:[~2020-02-21 8:56 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-21 8:56 [PATCH 00/15] updates & improvements Johannes Berg
2020-02-21 8:56 ` [PATCH 01/15] backports: handle RHEL 7.6 kernel Johannes Berg
2020-02-23 22:24 ` Hauke Mehrtens
2020-02-24 8:40 ` Johannes Berg
2020-02-24 22:47 ` Hauke Mehrtens
2020-03-11 9:38 ` Johannes Berg
2020-02-21 8:56 ` [PATCH 02/15] backports: update x509.asn1.[ch] Johannes Berg
2020-02-23 22:26 ` Hauke Mehrtens
2020-02-24 8:39 ` Johannes Berg
2020-02-21 8:56 ` [PATCH 03/15] backports: suppress attribute((cold)) warnings with gcc 9 Johannes Berg
2020-02-21 8:56 ` [PATCH 04/15] backports: add some more atomic functions Johannes Berg
2020-02-21 8:56 ` Johannes Berg [this message]
2020-02-21 8:56 ` [PATCH 06/15] backports: if_vlan: add VLAN_N_VID Johannes Berg
2020-02-21 8:56 ` [PATCH 07/15] patches: make nl80211.c include if_vlan.h Johannes Berg
2020-02-23 22:28 ` Hauke Mehrtens
2020-02-21 8:56 ` [PATCH 08/15] gentree: add timing info to git debug commit message Johannes Berg
2020-02-21 8:56 ` [PATCH 09/15] backports: debugfs: add unsigned long helpers Johannes Berg
2020-02-21 8:56 ` [PATCH 10/15] backports: patch lib/refcount.c to make sparse happy Johannes Berg
2020-02-21 8:56 ` [PATCH 11/15] gentree: add a --list-files option Johannes Berg
2020-02-21 8:56 ` [PATCH 12/15] git-tracker: use python2 explicitly Johannes Berg
2020-02-21 8:56 ` [PATCH 13/15] git-tracker: use write-tree/commit-tree/update-ref Johannes Berg
2020-02-21 8:56 ` [PATCH 14/15] git-tracker: refactor function that adds change-id Johannes Berg
2020-02-21 8:56 ` [PATCH 15/15] gentree: use 'git cat-file' to speed up obtaining objects Johannes Berg
2020-03-24 23:11 ` [PATCH 00/15] updates & improvements Hauke Mehrtens
2020-03-25 7:59 ` Johannes Berg
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=20200221085624.6213-3-johannes@sipsolutions.net \
--to=johannes@sipsolutions.net \
--cc=backports@vger.kernel.org \
--cc=hauke@hauke-m.de \
/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).