netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
To: davem@davemloft.net, johannes@sipsolutions.net, netdev@vger.kernel.org
Cc: "Jason A. Donenfeld" <Jason@zx2c4.com>
Subject: [PATCH net-next 1/8] net: skbuff: disambiguate argument and member for skb_list_walk_safe helper
Date: Mon, 13 Jan 2020 18:42:26 -0500	[thread overview]
Message-ID: <20200113234233.33886-2-Jason@zx2c4.com> (raw)
In-Reply-To: <20200113234233.33886-1-Jason@zx2c4.com>

This worked before, because we made all callers name their next pointer
"next". But in trying to be more "drop-in" ready, the silliness here is
revealed. This commit fixes the problem by making the macro argument and
the member use different names.

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
---
 include/linux/skbuff.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index 016b3c4ab99a..aaf73b34f72f 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -1479,9 +1479,9 @@ static inline void skb_mark_not_on_list(struct sk_buff *skb)
 }
 
 /* Iterate through singly-linked GSO fragments of an skb. */
-#define skb_list_walk_safe(first, skb, next)                                   \
-	for ((skb) = (first), (next) = (skb) ? (skb)->next : NULL; (skb);      \
-	     (skb) = (next), (next) = (skb) ? (skb)->next : NULL)
+#define skb_list_walk_safe(first, skb, next_skb)                               \
+	for ((skb) = (first), (next_skb) = (skb) ? (skb)->next : NULL; (skb);  \
+	     (skb) = (next_skb), (next_skb) = (skb) ? (skb)->next : NULL)
 
 static inline void skb_list_del_init(struct sk_buff *skb)
 {
-- 
2.24.1


  reply	other threads:[~2020-01-13 23:42 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-01-13 23:42 [PATCH net-next 0/8] skb_list_walk_safe refactoring for net/*'s skb_gso_segment usage Jason A. Donenfeld
2020-01-13 23:42 ` Jason A. Donenfeld [this message]
2020-01-13 23:42 ` [PATCH net-next 2/8] net: udp: use skb_list_walk_safe helper for gso segments Jason A. Donenfeld
2020-01-13 23:42 ` [PATCH net-next 3/8] net: xfrm: " Jason A. Donenfeld
2020-01-13 23:42 ` [PATCH net-next 4/8] net: openvswitch: " Jason A. Donenfeld
2020-01-13 23:42 ` [PATCH net-next 5/8] net: sched: " Jason A. Donenfeld
2020-01-13 23:42 ` [PATCH net-next 6/8] net: ipv4: " Jason A. Donenfeld
2020-01-13 23:42 ` [PATCH net-next 7/8] net: netfilter: " Jason A. Donenfeld
2020-01-13 23:42 ` [PATCH net-next 8/8] net: mac80211: " Jason A. Donenfeld
2020-01-14 19:49 ` [PATCH net-next 0/8] skb_list_walk_safe refactoring for net/*'s skb_gso_segment usage David Miller

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=20200113234233.33886-2-Jason@zx2c4.com \
    --to=jason@zx2c4.com \
    --cc=davem@davemloft.net \
    --cc=johannes@sipsolutions.net \
    --cc=netdev@vger.kernel.org \
    /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
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).