diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-16 11:11:53 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-16 11:11:53 -0700 |
| commit | b5dbc858717113c823fe6bb058807c2cb67d1efa (patch) | |
| tree | e82858156bf5d46b539455728ac1b8a7cd9feb02 /net/sctp/transport.c | |
| parent | d34e14f690d611ffe3db09e4ed8123d86c89a831 (diff) | |
| parent | c02db8c6290bb992442fec1407643c94cc414375 (diff) | |
| download | linux-next-b5dbc858717113c823fe6bb058807c2cb67d1efa.tar.gz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
rtnetlink: make SR-IOV VF interface symmetric
sctp: delete active ICMP proto unreachable timer when free transport
tcp: fix MD5 (RFC2385) support
Diffstat (limited to 'net/sctp/transport.c')
| -rw-r--r-- | net/sctp/transport.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/sctp/transport.c b/net/sctp/transport.c index 4a368038d46f..165d54e07fcd 100644 --- a/net/sctp/transport.c +++ b/net/sctp/transport.c @@ -173,6 +173,10 @@ void sctp_transport_free(struct sctp_transport *transport) del_timer(&transport->T3_rtx_timer)) sctp_transport_put(transport); + /* Delete the ICMP proto unreachable timer if it's active. */ + if (timer_pending(&transport->proto_unreach_timer) && + del_timer(&transport->proto_unreach_timer)) + sctp_association_put(transport->asoc); sctp_transport_put(transport); } |