diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2020-02-21 09:56:14 +0100 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2020-03-21 15:31:20 +0100 |
| commit | 5cc8da1789227e7524907f5a9ed6883a12e2559c (patch) | |
| tree | 2a31498bd7f776b767872755726f2a3612f42d94 | |
| parent | f5a03ac353fb6d5f6ab1fab547e90e5822ff96f9 (diff) | |
backports: Do not access rx_count and rx_list attributes
Upstream commit a4ff4832887a4c2aa3b7599ae784290b3d2ff041
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>
| -rw-r--r-- | patches/0092-listified-rx/iwlwifi.patch | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/patches/0092-listified-rx/iwlwifi.patch b/patches/0092-listified-rx/iwlwifi.patch new file mode 100644 index 00000000..5fd9c88d --- /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 +@@ -1539,11 +1539,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); |