Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bae6277a authored by Jason A. Donenfeld's avatar Jason A. Donenfeld Committed by Greg Kroah-Hartman
Browse files

net: skbuff: disambiguate argument and member for skb_list_walk_safe helper 



commit 5eee7bd7e245914e4e050c413dfe864e31805207 upstream.

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: default avatarJason A. Donenfeld <Jason@zx2c4.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8e6f5a1d

include/linux/skbuff.h

+3 −3
Original line number Diff line number Diff line
@@ -1364,9 +1364,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)

{