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

Commit 4141ddc0 authored by Gui Jianfeng's avatar Gui Jianfeng Committed by David S. Miller
Browse files

sctp: retran_path update bug fix 



If the current retran_path is the only active one, it should
update it to the the next inactive one.

Signed-off-by: default avatarGui Jianfeng <guijianfeng@cn.fujitsu.com>
Signed-off-by: default avatarVlad Yasevich <vladislav.yasevich@hp.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent aed5a833

net/sctp/associola.c

+12 −9
Original line number Diff line number Diff line
@@ -1203,6 +1203,9 @@ void sctp_assoc_update_retran_path(struct sctp_association *asoc) 
	struct list_head *head = &asoc->peer.transport_addr_list;

	struct list_head *pos;



	if (asoc->peer.transport_count == 1)

		return;



	/* Find the next transport in a round-robin fashion. */

	t = asoc->peer.retran_path;

	pos = &t->transports;
@@ -1217,6 +1220,15 @@ void sctp_assoc_update_retran_path(struct sctp_association *asoc) 


		t = list_entry(pos, struct sctp_transport, transports);



		/* We have exhausted the list, but didn't find any

		 * other active transports.  If so, use the next

		 * transport.

		 */

		if (t == asoc->peer.retran_path) {

			t = next;

			break;

		}



		/* Try to find an active transport. */



		if ((t->state == SCTP_ACTIVE) ||
@@ -1229,15 +1241,6 @@ void sctp_assoc_update_retran_path(struct sctp_association *asoc) 
			if (!next)

				next = t;

		}



		/* We have exhausted the list, but didn't find any

		 * other active transports.  If so, use the next

		 * transport.

		 */

		if (t == asoc->peer.retran_path) {

			t = next;

			break;

		}

	}



	asoc->peer.retran_path = t;