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

Commit bc14b8d6 authored by Ying Xue's avatar Ying Xue Committed by David S. Miller
Browse files

tipc: fix a link reset issue due to retransmission failures 



When a node joins a cluster while we are transmitting a fragment
stream over the broadcast link, it's missing the preceding fragments
needed to build a meaningful message. As a result, the node has to
drop it. However, as the fragment message is not acknowledged to
its sender before it's dropped, it accidentally causes link reset
of retransmission failure on the node.

Reported-by: default avatarErik Hugne <erik.hugne@ericsson.com>
Signed-off-by: default avatarYing Xue <ying.xue@windriver.com>
Reviewed-by: default avatarErik Hugne <erik.hugne@ericsson.com>
Tested-by: default avatarErik Hugne <erik.hugne@ericsson.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 358e048d

net/tipc/bcast.c

+5 −3
Original line number Original line Diff line number Diff line
@@ -523,11 +523,13 @@ void tipc_bclink_rcv(struct net *net, struct sk_buff *buf) 
			tipc_bclink_unlock(net);

			tipc_bclink_unlock(net);

			tipc_node_unlock(node);

			tipc_node_unlock(node);

		} else if (msg_user(msg) == MSG_FRAGMENTER) {

		} else if (msg_user(msg) == MSG_FRAGMENTER) {

			tipc_buf_append(&node->bclink.reasm_buf, &buf);

			if (unlikely(!buf && !node->bclink.reasm_buf))

				goto unlock;

			tipc_bclink_lock(net);

			tipc_bclink_lock(net);

			bclink_accept_pkt(node, seqno);

			bclink_accept_pkt(node, seqno);

			tipc_buf_append(&node->bclink.reasm_buf, &buf);

			if (unlikely(!buf && !node->bclink.reasm_buf)) {

				tipc_bclink_unlock(net);

				goto unlock;

			}

			bcl->stats.recv_fragments++;

			bcl->stats.recv_fragments++;

			if (buf) {

			if (buf) {

				bcl->stats.recv_fragmented++;

				bcl->stats.recv_fragmented++;