Backports Archive on lore.kernel.org
 help / color / Atom feed
From: Hauke Mehrtens <hauke@hauke-m.de>
To: backports@vger.kernel.org
Cc: johannes@sipsolutions.net, Hauke Mehrtens <hauke@hauke-m.de>
Subject: [PATCH 10/12] patches: Do not use GRO_CONSUMED on kernel < 4.11
Date: Mon,  5 Aug 2019 14:07:02 +0200
Message-ID: <20190805120704.13128-11-hauke@hauke-m.de> (raw)
In-Reply-To: <20190805120704.13128-1-hauke@hauke-m.de>

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

--
To unsubscribe from this list: send the line "unsubscribe backports" in

  parent reply index

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-08-05 12:06 [PATCH 00/12] backports: Update to kernel 5.3-rc3 Hauke Mehrtens
2019-08-05 12:06 ` [PATCH 01/12] patches: Refresh patches against " Hauke Mehrtens
2019-08-05 12:06 ` [PATCH 02/12] header: Add BITS_PER_TYPE() Hauke Mehrtens
2019-08-05 12:06 ` [PATCH 03/12] header: Add ktime_get_boottime_ns() Hauke Mehrtens
2019-08-05 12:06 ` [PATCH 04/12] header: Add nl80211_validate_nested() Hauke Mehrtens
2019-08-05 12:06 ` [PATCH 05/12] header: Add trace_##name##_enabled() Hauke Mehrtens
2019-08-05 12:06 ` [PATCH 06/12] header: Remove skb_xmit_more() Hauke Mehrtens
2019-08-05 12:06 ` [PATCH 07/12] backport: Add genl_callback_extack() function Hauke Mehrtens
2019-08-05 12:07 ` [PATCH 08/12] backport: Add arc4 library Hauke Mehrtens
2019-08-05 12:07 ` [PATCH 09/12] patches: Add include in cfg80211.h Hauke Mehrtens
2019-08-05 12:07 ` Hauke Mehrtens [this message]
2019-08-05 12:07 ` [PATCH 11/12] dependencies: Make AIRO depend on kernel 4.20 Hauke Mehrtens
2019-08-05 12:07 ` [PATCH 12/12] kconfig: Update to KConfig to version from kernel 4.17 Hauke Mehrtens

Reply instructions:

You may reply publically 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=20190805120704.13128-11-hauke@hauke-m.de \
    --to=hauke@hauke-m.de \
    --cc=backports@vger.kernel.org \
    --cc=johannes@sipsolutions.net \
    /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

Backports Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/backports/0 backports/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 backports backports/ https://lore.kernel.org/backports \
		backports@vger.kernel.org backports@archiver.kernel.org
	public-inbox-index backports


Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.backports


AGPL code for this site: git clone https://public-inbox.org/ public-inbox