diff options
author | John Heffner <jheffner@psc.edu> | 2006-03-21 00:32:58 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2006-03-21 00:32:58 -0500 |
commit | 0e7b13685f9a06949ea3070c97c0f0085a08cd37 (patch) | |
tree | 3ba0a11d61dc2dd64d7a93bb5cd70d58a46fec39 /net/ipv4/tcp_input.c | |
parent | 1d541ddd74802cfa0eb8a3864668851f6cd79bdf (diff) |
[TCP] mtu probing: move tcp-specific data out of inet_connection_sock
This moves some TCP-specific MTU probing state out of
inet_connection_sock back to tcp_sock.
Signed-off-by: John Heffner <jheffner@psc.edu>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp_input.c')
-rw-r--r-- | net/ipv4/tcp_input.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index 0ac388e3d01d..195d83584558 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c | |||
@@ -2054,7 +2054,7 @@ tcp_fastretrans_alert(struct sock *sk, u32 prior_snd_una, | |||
2054 | /* MTU probe failure: don't reduce cwnd */ | 2054 | /* MTU probe failure: don't reduce cwnd */ |
2055 | if (icsk->icsk_ca_state < TCP_CA_CWR && | 2055 | if (icsk->icsk_ca_state < TCP_CA_CWR && |
2056 | icsk->icsk_mtup.probe_size && | 2056 | icsk->icsk_mtup.probe_size && |
2057 | tp->snd_una == icsk->icsk_mtup.probe_seq_start) { | 2057 | tp->snd_una == tp->mtu_probe.probe_seq_start) { |
2058 | tcp_mtup_probe_failed(sk); | 2058 | tcp_mtup_probe_failed(sk); |
2059 | /* Restores the reduction we did in tcp_mtup_probe() */ | 2059 | /* Restores the reduction we did in tcp_mtup_probe() */ |
2060 | tp->snd_cwnd++; | 2060 | tp->snd_cwnd++; |
@@ -2284,7 +2284,7 @@ static int tcp_clean_rtx_queue(struct sock *sk, __s32 *seq_rtt_p) | |||
2284 | 2284 | ||
2285 | /* MTU probing checks */ | 2285 | /* MTU probing checks */ |
2286 | if (icsk->icsk_mtup.probe_size) { | 2286 | if (icsk->icsk_mtup.probe_size) { |
2287 | if (!after(icsk->icsk_mtup.probe_seq_end, TCP_SKB_CB(skb)->end_seq)) { | 2287 | if (!after(tp->mtu_probe.probe_seq_end, TCP_SKB_CB(skb)->end_seq)) { |
2288 | tcp_mtup_probe_success(sk, skb); | 2288 | tcp_mtup_probe_success(sk, skb); |
2289 | } | 2289 | } |
2290 | } | 2290 | } |