---

yaml --- r: 190902 b: refs/heads/master c: 55fa0cf h: refs/heads/master v: v3
git-mirror · May 16, 2010 · 4e8f9f9 · 4e8f9f9
1 parent 2d67354
commit 4e8f9f9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 35790c0421121364883a167bab8a2e37e1f67f78
+refs/heads/master: 55fa0cfd7c3ac2ae34cac7dca2e3fbcfe661e6c3
diff --git a/trunk/net/sctp/transport.c b/trunk/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);
 }