diff mbox series

[10/12] patches: Do not use GRO_CONSUMED on kernel < 4.11

Message ID 20190805120704.13128-11-hauke@hauke-m.de (mailing list archive)
State Accepted
Headers show
Series backports: Update to kernel 5.3-rc3 | expand

Commit Message

Hauke Mehrtens Aug. 5, 2019, 12:07 p.m. UTC 
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>
---
 patches/0090-remove-GRO_CONSUMED.patch | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 patches/0090-remove-GRO_CONSUMED.patch
diff mbox series

Patch

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