From: Wei Yongjun <yjwei@cn.fujitsu.com>
Date: Sun, 9 May 2010 16:56:07 +0000 (+0000)
Subject: sctp: delete active ICMP proto unreachable timer when free transport
X-Git-Tag: v3.0~4993^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=55fa0cfd7c3ac2ae34cac7dca2e3fbcfe661e6c3;p=platform%2Fkernel%2Flinux-amlogic.git

sctp: delete active ICMP proto unreachable timer when free transport

transport may be free before ICMP proto unreachable timer expire, so
we should delete active ICMP proto unreachable timer when transport
is going away.

Signed-off-by: Wei Yongjun <yjwei@cn.fujitsu.com>
Acked-by: Vlad Yasevich <vladislav.yasevich@hp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/sctp/transport.c b/net/sctp/transport.c
index 4a36803..165d54e 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);
 }