diff options
| author | David S. Miller <davem@sunset.davemloft.net> | 2007-11-12 18:16:13 -0800 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-11-12 18:16:13 -0800 |
| commit | bce943278dc4aa03b0ef9c7cf8b1b7110eda8b91 (patch) | |
| tree | 4225e979eb543e1970eb2b38174bd5dbdfd42237 /net/sctp/transport.c | |
| parent | 91cf45f02af5c871251165d000c3f42a2a0b0552 (diff) | |
| parent | 9abed245a6dc94c32b2f45a1ecc51a0829d11470 (diff) | |
Merge branch 'pending' of master.kernel.org:/pub/scm/linux/kernel/git/vxy/lksctp-dev
Diffstat (limited to 'net/sctp/transport.c')
| -rw-r--r-- | net/sctp/transport.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/sctp/transport.c b/net/sctp/transport.c index 5f467c914f8..d55ce83a020 100644 --- a/net/sctp/transport.c +++ b/net/sctp/transport.c @@ -74,8 +74,8 @@ static struct sctp_transport *sctp_transport_init(struct sctp_transport *peer, * given destination transport address, set RTO to the protocol * parameter 'RTO.Initial'. */ + peer->last_rto = peer->rto = msecs_to_jiffies(sctp_rto_initial); peer->rtt = 0; - peer->rto = msecs_to_jiffies(sctp_rto_initial); peer->rttvar = 0; peer->srtt = 0; peer->rto_pending = 0; @@ -385,6 +385,7 @@ void sctp_transport_update_rto(struct sctp_transport *tp, __u32 rtt) tp->rto = tp->asoc->rto_max; tp->rtt = rtt; + tp->last_rto = tp->rto; /* Reset rto_pending so that a new RTT measurement is started when a * new data chunk is sent. @@ -578,7 +579,7 @@ void sctp_transport_reset(struct sctp_transport *t) */ t->cwnd = min(4*asoc->pathmtu, max_t(__u32, 2*asoc->pathmtu, 4380)); t->ssthresh = asoc->peer.i.a_rwnd; - t->rto = asoc->rto_initial; + t->last_rto = t->rto = asoc->rto_initial; t->rtt = 0; t->srtt = 0; t->rttvar = 0; |