diff options
| author | David S. Miller <davem@davemloft.net> | 2010-05-04 03:20:44 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-05-04 03:24:31 +0400 |
| commit | f5460618405eec8c3300947a499011528a115acd (patch) | |
| tree | 19aba5acb6d91d5a20400292aaf1881a6b26c118 /net/sctp/sm_sideeffect.c | |
| parent | 4f70ecca9c57731b4acbe5043eb22e4416bd2368 (diff) | |
| parent | 0e3aef8d09a8c11e3fb83cdcb24b5bc7421b3726 (diff) | |
| download | linux-f5460618405eec8c3300947a499011528a115acd.tar.xz | |
Merge branch 'net-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vxy/lksctp-dev
Add missing linux/vmalloc.h include to net/sctp/probe.c
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sctp/sm_sideeffect.c')
| -rw-r--r-- | net/sctp/sm_sideeffect.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/net/sctp/sm_sideeffect.c b/net/sctp/sm_sideeffect.c index d5ae450b6f02..3b7230ef77c2 100644 --- a/net/sctp/sm_sideeffect.c +++ b/net/sctp/sm_sideeffect.c @@ -697,11 +697,15 @@ static void sctp_cmd_setup_t2(sctp_cmd_seq_t *cmds, { struct sctp_transport *t; - t = sctp_assoc_choose_alter_transport(asoc, + if (chunk->transport) + t = chunk->transport; + else { + t = sctp_assoc_choose_alter_transport(asoc, asoc->shutdown_last_sent_to); + chunk->transport = t; + } asoc->shutdown_last_sent_to = t; asoc->timeouts[SCTP_EVENT_TIMEOUT_T2_SHUTDOWN] = t->rto; - chunk->transport = t; } /* Helper function to change the state of an association. */ |