summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2019-08-03 12:03:29 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2019-08-14 20:15:48 +0200
commit818a5cc84d6ccbf1d87e87b70549e8db3e2f4d26 (patch)
tree51fe2db2cbae25eaf18e2c02841a9d1eefda2214
parent8d4d173326b4e5fa35e69c9de13ae02283c876a9 (diff)
patches: Do not use GRO_CONSUMED on kernel < 4.11
GRO_CONSUMED was added in kernel commit 25393d3fc055 ("net: Prepare gro for packet consuming gro callbacks") in kernel 4.11. Just remove it for older kernel versions. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
-rw-r--r--patches/0090-remove-GRO_CONSUMED.patch16
1 files changed, 16 insertions, 0 deletions
diff --git a/patches/0090-remove-GRO_CONSUMED.patch b/patches/0090-remove-GRO_CONSUMED.patch
new file mode 100644
index 00000000..a2bf2cc6
--- /dev/null
+++ b/patches/0090-remove-GRO_CONSUMED.patch
@@ -0,0 +1,16 @@
+GRO_CONSUMED was added in kernel commit 25393d3fc055 ("net: Prepare gro
+for packet consuming gro callbacks") in kernel 4.11. Just remove it for
+older kernel versions.
+
+--- a/drivers/net/wireless/ath/wil6210/txrx.c
++++ b/drivers/net/wireless/ath/wil6210/txrx.c
+@@ -750,7 +750,9 @@ void wil_netif_rx_any(struct sk_buff *sk
+ [GRO_HELD] = "GRO_HELD",
+ [GRO_NORMAL] = "GRO_NORMAL",
+ [GRO_DROP] = "GRO_DROP",
++#if LINUX_VERSION_IS_GEQ(4,11,0)
+ [GRO_CONSUMED] = "GRO_CONSUMED",
++#endif /* > 4.11 */
+ };
+
+ wil->txrx_ops.get_netif_rx_params(skb, &cid, &security);