aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorJohn Heffner <jheffner@psc.edu>2006-03-21 00:32:58 -0500
committerDavid S. Miller <davem@davemloft.net>2006-03-21 00:32:58 -0500
commit0e7b13685f9a06949ea3070c97c0f0085a08cd37 (patch)
tree3ba0a11d61dc2dd64d7a93bb5cd70d58a46fec39 /net
parent1d541ddd74802cfa0eb8a3864668851f6cd79bdf (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')
-rw-r--r--net/ipv4/tcp_input.c4
-rw-r--r--net/ipv4/tcp_output.c4
2 files changed, 4 insertions, 4 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 }
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
index 8197b5e12f1f..518e568b53f3 100644
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@ -1238,8 +1238,8 @@ static int tcp_mtu_probe(struct sock *sk)
1238 update_send_head(sk, tp, nskb); 1238 update_send_head(sk, tp, nskb);
1239 1239
1240 icsk->icsk_mtup.probe_size = tcp_mss_to_mtu(sk, nskb->len); 1240 icsk->icsk_mtup.probe_size = tcp_mss_to_mtu(sk, nskb->len);
1241 icsk->icsk_mtup.probe_seq_start = TCP_SKB_CB(nskb)->seq; 1241 tp->mtu_probe.probe_seq_start = TCP_SKB_CB(nskb)->seq;
1242 icsk->icsk_mtup.probe_seq_end = TCP_SKB_CB(nskb)->end_seq; 1242 tp->mtu_probe.probe_seq_end = TCP_SKB_CB(nskb)->end_seq;
1243 1243
1244 return 1; 1244 return 1;
1245 } 1245 }