Backports Archive on lore.kernel.org
 help / color / Atom feed
From: Luca Coelho <luca@coelho.fi>
To: backports@vger.kernel.org
Cc: Johannes Berg <johannes.berg@intel.com>,
	Luca Coelho <luciano.coelho@intel.com>
Subject: [PATCH 11/14] backports: improve skb->xmit_more handling
Date: Thu, 20 Sep 2018 14:28:39 +0300
Message-ID: <20180920112842.27198-12-luca@coelho.fi> (raw)
In-Reply-To: <20180920112842.27198-1-luca@coelho.fi>

From: Johannes Berg <johannes.berg@intel.com>

Replace the existing skb->xmit_more semantic patch rule with a more
generic one that uses a helper inline function.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
---
 backport/backport-include/linux/skbuff.h          |  9 +++++++++
 patches/0059-skb_xmit_more/skb_no_xmit_more.cocci | 10 +++-------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/backport/backport-include/linux/skbuff.h b/backport/backport-include/linux/skbuff.h
index 034206b6649d..61133c4277cc 100644
--- a/backport/backport-include/linux/skbuff.h
+++ b/backport/backport-include/linux/skbuff.h
@@ -200,6 +200,15 @@ static inline struct sk_buff *__pskb_copy_fclone(struct sk_buff *skb,
 struct sk_buff *skb_clone_sk(struct sk_buff *skb);
 #endif
 
+static inline bool skb_xmit_more(struct sk_buff *skb)
+{
+#if LINUX_VERSION_IS_LESS(3,18,0)
+	return false;
+#else
+	return skb->xmit_more;
+#endif
+}
+
 #if LINUX_VERSION_IS_LESS(3,19,0)
 /**
  * __dev_alloc_pages - allocate page for network Rx
diff --git a/patches/0059-skb_xmit_more/skb_no_xmit_more.cocci b/patches/0059-skb_xmit_more/skb_no_xmit_more.cocci
index ab20c833af40..bf7f22e267a3 100644
--- a/patches/0059-skb_xmit_more/skb_no_xmit_more.cocci
+++ b/patches/0059-skb_xmit_more/skb_no_xmit_more.cocci
@@ -1,9 +1,5 @@
-@r1@
+@@
 struct sk_buff *skb;
-expression E1;
 @@
- if (E1
-+#if LINUX_VERSION_IS_GEQ(3,18,0)
- || !skb->xmit_more
-+#endif /* if LINUX_VERSION_IS_GEQ(3,18,0) */
- ) {...}
+-skb->xmit_more
++skb_xmit_more(skb)
-- 
2.18.0

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

  parent reply index

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-09-20 11:28 [PATCH 00/14] backport: updates for 4.19 Luca Coelho
2018-09-20 11:28 ` [PATCH 01/14] backport: fix compilation with IPV6 not set Luca Coelho
2018-09-20 11:28 ` [PATCH 02/14] backports: add wait_event_killable_timeout backport support Luca Coelho
2018-09-20 11:28 ` [PATCH 03/14] backport: introduce match_string() for kernels < 4.6 Luca Coelho
2018-09-20 11:28 ` [PATCH 04/14] backport: add patch to ignore iwlwifi removal on < 3.14 kernels Luca Coelho
2018-09-20 11:28 ` [PATCH 05/14] backport: convert tree section names to ascii Luca Coelho
2018-09-20 11:28 ` [PATCH 06/14] backport: add rhashtable-types.h Luca Coelho
2018-09-20 11:28 ` [PATCH 07/14] backport: remove duplicate leds.h inclusion from backport-4.5.c Luca Coelho
2018-09-20 11:28 ` [PATCH 08/14] backport: prevent unused subclass variable warning in < 3.18 Luca Coelho
2018-09-20 11:28 ` [PATCH 09/14] backport: make ktime_get_boottime_seconds() non-inline Luca Coelho
2018-09-20 11:28 ` [PATCH 10/14] backport: update u64_stats_init() to a new version in kernels < 4.2 Luca Coelho
2018-09-20 11:28 ` Luca Coelho [this message]
2018-09-20 11:28 ` [PATCH 12/14] backport: update lib-rhashtable.c Luca Coelho
2018-09-20 16:23   ` Luciano Coelho
2018-09-20 11:28 ` [PATCH 13/14] backport: convert int led activate op to void when needed Luca Coelho
2018-09-23 12:30   ` Hauke Mehrtens
2018-09-24  9:24     ` Luca Coelho
2018-09-20 11:28 ` [PATCH 14/14] backports: add __alloc_bucket_spinlocks() for < 4.19 Luca Coelho
2018-09-23 14:14 ` [PATCH 00/14] backport: updates for 4.19 Hauke Mehrtens
2018-09-24  9:26   ` Luca Coelho

Reply instructions:

You may reply publicly 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=20180920112842.27198-12-luca@coelho.fi \
    --to=luca@coelho.fi \
    --cc=backports@vger.kernel.org \
    --cc=johannes.berg@intel.com \
    --cc=luciano.coelho@intel.com \
    /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
	public-inbox-index backports

Example config snippet for mirrors

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.git