diff options
author | Jakub Kicinski <kuba@kernel.org> | 2024-09-15 09:12:21 -0700 |
---|---|---|
committer | Jakub Kicinski <kuba@kernel.org> | 2024-09-15 09:13:19 -0700 |
commit | 3561373114c8b3359114e2da27259317dc51145a (patch) | |
tree | 3885239a7987bc96fc9eb3684f77ff4d9e42eef7 /net/tipc | |
parent | be461814aa4cb32aae061404b9a6a83ef3895018 (diff) | |
parent | 7052622fccb1efb850c6b55de477f65d03525a30 (diff) | |
download | lwn-3561373114c8b3359114e2da27259317dc51145a.tar.gz lwn-3561373114c8b3359114e2da27259317dc51145a.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Merge in late fixes to prepare for the 6.12 net-next PR.
No conflicts or adjacent changes.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/tipc')
-rw-r--r-- | net/tipc/bcast.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/tipc/bcast.c b/net/tipc/bcast.c index 593846d25214..114fef65f92e 100644 --- a/net/tipc/bcast.c +++ b/net/tipc/bcast.c @@ -320,8 +320,8 @@ static int tipc_mcast_send_sync(struct net *net, struct sk_buff *skb, { struct tipc_msg *hdr, *_hdr; struct sk_buff_head tmpq; + u16 cong_link_cnt = 0; struct sk_buff *_skb; - u16 cong_link_cnt; int rc = 0; /* Is a cluster supporting with new capabilities ? */ |