Commit f3903bcc authored May 26, 2015 by Jon Paul Maloy Committed by David S. Miller May 26, 2015

tipc: fix bug in link protocol message create function



In commit dd3f9e70
("tipc: add packet sequence number at instant of transmission") we
made a change with the consequence that packets in the link backlog
queue don't contain valid sequence numbers.

However, when we create a link protocol message, we still use the
sequence number of the first packet in the backlog, if there is any,
as "next_sent" indicator in the message. This may entail unnecessary
retransissions or stale packet transmission when there is very low
traffic on the link.

This commit fixes this issue by only using the current value of
tipc_link::snd_nxt as indicator.

Signed-off-by: Jon Maloy <jon.maloy@ericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 05c98543

net/tipc/link.c

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -1320,8 +1320,6 @@ void tipc_link_proto_xmit(struct tipc_link *l_ptr, u32 msg_typ, int probe_msg,

	if (!tipc_link_is_up(l_ptr))		if (!tipc_link_is_up(l_ptr))
	return;		return;
	if (skb_queue_len(&l_ptr->backlogq))
	next_sent = buf_seqno(skb_peek(&l_ptr->backlogq));
	msg_set_next_sent(msg, next_sent);		msg_set_next_sent(msg, next_sent);
	if (!skb_queue_empty(&l_ptr->deferdq)) {		if (!skb_queue_empty(&l_ptr->deferdq)) {
	last_rcv = buf_seqno(skb_peek(&l_ptr->deferdq));		last_rcv = buf_seqno(skb_peek(&l_ptr->deferdq));

Admin message