diff options
| author | David S. Miller <davem@davemloft.net> | 2010-05-16 22:26:58 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-05-16 22:26:58 -0700 |
| commit | 6811d58fc148c393f80a9f5a9db49d7e75cdc546 (patch) | |
| tree | c25d5b0e49ec848943d35f819e748d157ccb492e /net/sctp/transport.c | |
| parent | c4949f074332a64baeb2ead6ab9319ca37642f96 (diff) | |
| parent | c02db8c6290bb992442fec1407643c94cc414375 (diff) | |
| download | talos-obmc-linux-6811d58fc148c393f80a9f5a9db49d7e75cdc546.tar.gz talos-obmc-linux-6811d58fc148c393f80a9f5a9db49d7e75cdc546.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
include/linux/if_link.h
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 d67501f92ca3..132046cb82fc 100644 --- a/net/sctp/transport.c +++ b/net/sctp/transport.c @@ -148,6 +148,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); } |
