Skip to content

Commit d0f3684

Browse files
edumazetdavem330
authored andcommitted
tcp: tcp_mtu_probing() cleanup
Reduce one indentation level to make code more readable. tcp_sync_mss() can be factorized. Signed-off-by: Eric Dumazet <[email protected]> Acked-by: Neal Cardwell <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent f21506c commit d0f3684

File tree

1 file changed

+14
-17
lines changed

1 file changed

+14
-17
lines changed

net/ipv4/tcp_timer.c

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -107,26 +107,23 @@ static int tcp_orphan_retries(struct sock *sk, bool alive)
107107

108108
static void tcp_mtu_probing(struct inet_connection_sock *icsk, struct sock *sk)
109109
{
110-
struct net *net = sock_net(sk);
110+
const struct net *net = sock_net(sk);
111+
int mss;
111112

112113
/* Black hole detection */
113-
if (net->ipv4.sysctl_tcp_mtu_probing) {
114-
if (!icsk->icsk_mtup.enabled) {
115-
icsk->icsk_mtup.enabled = 1;
116-
icsk->icsk_mtup.probe_timestamp = tcp_jiffies32;
117-
tcp_sync_mss(sk, icsk->icsk_pmtu_cookie);
118-
} else {
119-
struct net *net = sock_net(sk);
120-
struct tcp_sock *tp = tcp_sk(sk);
121-
int mss;
122-
123-
mss = tcp_mtu_to_mss(sk, icsk->icsk_mtup.search_low) >> 1;
124-
mss = min(net->ipv4.sysctl_tcp_base_mss, mss);
125-
mss = max(mss, 68 - tp->tcp_header_len);
126-
icsk->icsk_mtup.search_low = tcp_mss_to_mtu(sk, mss);
127-
tcp_sync_mss(sk, icsk->icsk_pmtu_cookie);
128-
}
114+
if (!net->ipv4.sysctl_tcp_mtu_probing)
115+
return;
116+
117+
if (!icsk->icsk_mtup.enabled) {
118+
icsk->icsk_mtup.enabled = 1;
119+
icsk->icsk_mtup.probe_timestamp = tcp_jiffies32;
120+
} else {
121+
mss = tcp_mtu_to_mss(sk, icsk->icsk_mtup.search_low) >> 1;
122+
mss = min(net->ipv4.sysctl_tcp_base_mss, mss);
123+
mss = max(mss, 68 - tcp_sk(sk)->tcp_header_len);
124+
icsk->icsk_mtup.search_low = tcp_mss_to_mtu(sk, mss);
129125
}
126+
tcp_sync_mss(sk, icsk->icsk_pmtu_cookie);
130127
}
131128

132129

0 commit comments

Comments
 (0)