Commit 5a4c3552 authored by Jon Maloy's avatar Jon Maloy Committed by David S. Miller

tipc: fix bug in broadcast synch message create function

In commit d999297c
("tipc: reduce locking scope during packet reception") we introduced
a new function tipc_build_bcast_sync_msg(), which carries initial
synchronization data between two nodes at first contact and at
re-contact. In this function, we missed to add synchronization data,
with the effect that the broadcast link endpoints will fail to
synchronize correctly at re-contact between a running and a restarted
node. All other cases work as intended.

With this commit, we fix this bug.
Signed-off-by: default avatarJon Maloy <jon.maloy@ericsson.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 73d0fcf2
...@@ -294,11 +294,14 @@ static void tipc_link_build_bcast_sync_msg(struct tipc_link *l, ...@@ -294,11 +294,14 @@ static void tipc_link_build_bcast_sync_msg(struct tipc_link *l,
{ {
struct sk_buff *skb; struct sk_buff *skb;
struct sk_buff_head list; struct sk_buff_head list;
u16 last_sent;
skb = tipc_msg_create(BCAST_PROTOCOL, STATE_MSG, INT_H_SIZE, skb = tipc_msg_create(BCAST_PROTOCOL, STATE_MSG, INT_H_SIZE,
0, l->addr, link_own_addr(l), 0, 0, 0); 0, l->addr, link_own_addr(l), 0, 0, 0);
if (!skb) if (!skb)
return; return;
last_sent = tipc_bclink_get_last_sent(l->owner->net);
msg_set_last_bcast(buf_msg(skb), last_sent);
__skb_queue_head_init(&list); __skb_queue_head_init(&list);
__skb_queue_tail(&list, skb); __skb_queue_tail(&list, skb);
tipc_link_xmit(l, &list, xmitq); tipc_link_xmit(l, &list, xmitq);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment