From c0e6df57194fdbbadf5d051f43f480fcf132281a Mon Sep 17 00:00:00 2001 From: Florian Westphal Date: Fri, 18 Jul 2008 23:04:39 -0700 Subject: [PATCH] --- yaml --- r: 103643 b: refs/heads/master c: 6d0ccbac688207ca0616ab5094932af4db4747b3 h: refs/heads/master i: 103641: 028336f9ac997f16d4e5f32212824987a63905a2 103639: 597405e2cc686ca84e4e1e061cf3d80df53e81ee v: v3 --- [refs] | 2 +- trunk/net/sctp/associola.c | 1 + trunk/net/sctp/transport.c | 3 +++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index db91ee8a1433..6095a1ec9b4b 100644 --- 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 index 35b6a023a6d0..ec2a0a33fd78 100644 --- 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 index 3f34f61221ec..e745c118f239 100644 --- 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,