| From 5eee7bd7e245914e4e050c413dfe864e31805207 Mon Sep 17 00:00:00 2001 |
| From: "Jason A. Donenfeld" <Jason@zx2c4.com> |
| Date: Mon, 13 Jan 2020 18:42:26 -0500 |
| Subject: net: skbuff: disambiguate argument and member for skb_list_walk_safe helper |
| |
| From: Jason A. Donenfeld <Jason@zx2c4.com> |
| |
| 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: Jason A. Donenfeld <Jason@zx2c4.com> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| include/linux/skbuff.h | 6 +++--- |
| 1 file changed, 3 insertions(+), 3 deletions(-) |
| |
| --- a/include/linux/skbuff.h |
| +++ b/include/linux/skbuff.h |
| @@ -1364,9 +1364,9 @@ static inline void skb_mark_not_on_list( |
| } |
| |
| /* 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) |
| { |
