diff options
| author | Jason A. Donenfeld <Jason@zx2c4.com> | 2020-01-13 18:42:26 -0500 |
|---|---|---|
| committer | Michael Bestas <mkbestas@lineageos.org> | 2020-12-31 19:40:41 +0200 |
| commit | f3f81d986adb86406d62b52a78ddbeebb55221ca (patch) | |
| tree | 05b46b6138c7b9887b56445a2f20aa45defe6922 /include/linux | |
| parent | 1788f6e6adf6b5ffb3899c3353e31478e88bfde5 (diff) | |
UPSTREAM: net: skbuff: disambiguate argument and member for skb_list_walk_safe helper
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
(cherry picked from commit 5eee7bd7e245914e4e050c413dfe864e31805207)
Bug: 152722841
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I4778eb05d0ed284543822bd3ba537379c3c19b85
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/skbuff.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index ab6a4fb9d82b..334534474828 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -1123,9 +1123,9 @@ static inline struct skb_shared_hwtstamps *skb_hwtstamps(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) /** * skb_queue_empty - check if a queue is empty |