diff options
Diffstat (limited to 'net/ipv4/tcp_timer.c')
-rw-r--r-- | net/ipv4/tcp_timer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c index 8f1480808f90..ea111e91f0e5 100644 --- a/net/ipv4/tcp_timer.c +++ b/net/ipv4/tcp_timer.c | |||
@@ -116,8 +116,6 @@ static int tcp_orphan_retries(struct sock *sk, int alive) | |||
116 | 116 | ||
117 | static void tcp_mtu_probing(struct inet_connection_sock *icsk, struct sock *sk) | 117 | static void tcp_mtu_probing(struct inet_connection_sock *icsk, struct sock *sk) |
118 | { | 118 | { |
119 | int mss; | ||
120 | |||
121 | /* Black hole detection */ | 119 | /* Black hole detection */ |
122 | if (sysctl_tcp_mtu_probing) { | 120 | if (sysctl_tcp_mtu_probing) { |
123 | if (!icsk->icsk_mtup.enabled) { | 121 | if (!icsk->icsk_mtup.enabled) { |
@@ -125,6 +123,8 @@ static void tcp_mtu_probing(struct inet_connection_sock *icsk, struct sock *sk) | |||
125 | tcp_sync_mss(sk, icsk->icsk_pmtu_cookie); | 123 | tcp_sync_mss(sk, icsk->icsk_pmtu_cookie); |
126 | } else { | 124 | } else { |
127 | struct tcp_sock *tp = tcp_sk(sk); | 125 | struct tcp_sock *tp = tcp_sk(sk); |
126 | int mss; | ||
127 | |||
128 | mss = tcp_mtu_to_mss(sk, icsk->icsk_mtup.search_low)/2; | 128 | mss = tcp_mtu_to_mss(sk, icsk->icsk_mtup.search_low)/2; |
129 | mss = min(sysctl_tcp_base_mss, mss); | 129 | mss = min(sysctl_tcp_base_mss, mss); |
130 | mss = max(mss, 68 - tp->tcp_header_len); | 130 | mss = max(mss, 68 - tp->tcp_header_len); |