---

yaml --- r: 103643 b: refs/heads/master c: 6d0ccba h: refs/heads/master i: 103641: 028336f 103639: 597405e v: v3
git-mirror · Jul 19, 2008 · c0e6df5 · c0e6df5
1 parent 26d1652
commit c0e6df5
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c4e85f82edcd6027cfe67331a2e00741b009756b
+refs/heads/master: 6d0ccbac688207ca0616ab5094932af4db4747b3
diff --git a/trunk/net/sctp/associola.c b/trunk/net/sctp/associola.c
@@ -653,6 +653,7 @@ struct sctp_transport *sctp_assoc_add_peer(struct sctp_association *asoc,
 
 	SCTP_DEBUG_PRINTK("sctp_assoc_add_peer:association %p PMTU set to "
 			  "%d\n", asoc, asoc->pathmtu);
+	peer->pmtu_pending = 0;
 
 	asoc->frag_point = sctp_frag_point(sp, asoc->pathmtu);
 

diff --git a/trunk/net/sctp/transport.c b/trunk/net/sctp/transport.c
@@ -100,6 +100,9 @@ static struct sctp_transport *sctp_transport_init(struct sctp_transport *peer,
 	INIT_LIST_HEAD(&peer->send_ready);
 	INIT_LIST_HEAD(&peer->transports);
 
+	peer->T3_rtx_timer.expires = 0;
+	peer->hb_timer.expires = 0;
+
 	setup_timer(&peer->T3_rtx_timer, sctp_generate_t3_rtx_event,
 			(unsigned long)peer);
 	setup_timer(&peer->hb_timer, sctp_generate_heartbeat_event,