diff options
| author | Gui Jianfeng <guijianfeng@cn.fujitsu.com> | 2008-06-04 21:37:33 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-06-04 21:37:33 +0200 |
| commit | 4141ddc02a92a6e3e5793601554c6033e83c25b9 (patch) | |
| tree | 2edf77fb5f0b021692e15dafe3660d13c7c637cd /net/sctp | |
| parent | Merge branch 'net-2.6-misc-20080605a' of git://git.linux-ipv6.org/gitroot/yos... (diff) | |
| download | linux-4141ddc02a92a6e3e5793601554c6033e83c25b9.tar.xz linux-4141ddc02a92a6e3e5793601554c6033e83c25b9.zip | |
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: Gui Jianfeng <guijianfeng@cn.fujitsu.com>
Signed-off-by: Vlad Yasevich <vladislav.yasevich@hp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sctp')
| -rw-r--r-- | net/sctp/associola.c | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/net/sctp/associola.c b/net/sctp/associola.c index b4cd2b71953f..532634861db1 100644 --- a/net/sctp/associola.c +++ b/net/sctp/associola.c @@ -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; |