[05/15] backports: Do not access rx_count and rx_list attributes
diff mbox series

Message ID 20200221085624.6213-3-johannes@sipsolutions.net
State New
Headers show
Series
  • updates & improvements
Related show

Commit Message

Johannes Berg Feb. 21, 2020, 8:56 a.m. UTC
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

Patch
diff mbox series

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);