diff options
| author |   Eric Dumazet <edumazet@google.com> | 2017-02-02 08:04:56 -0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2017-02-03 11:19:34 -0500 |
| commit | 3541f9e8bdebce02458882b66b638d7302c1f616 (patch) | |
| tree | 1049ef01f68f197e66fa77f18768aaf6d219f8b1 /net/ipv4/tcp_ipv4.c | |
| parent | hns_enet: use cpumask_var_t for on-stack mask (diff) | |
| download | linux-dev-3541f9e8bdebce02458882b66b638d7302c1f616.tar.xz linux-dev-3541f9e8bdebce02458882b66b638d7302c1f616.zip | |
tcp: add tcp_mss_clamp() helper
Small cleanup factorizing code doing the TCP_MAXSEG clamping.
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp_ipv4.c')
| -rw-r--r-- | net/ipv4/tcp_ipv4.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index 8c9e9aa17d66..8c124d4ef4b7 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c @@ -1324,10 +1324,7 @@ struct sock *tcp_v4_syn_recv_sock(const struct sock *sk, struct sk_buff *skb, tcp_ca_openreq_child(newsk, dst); tcp_sync_mss(newsk, dst_mtu(dst)); - newtp->advmss = dst_metric_advmss(dst); - if (tcp_sk(sk)->rx_opt.user_mss && - tcp_sk(sk)->rx_opt.user_mss < newtp->advmss) - newtp->advmss = tcp_sk(sk)->rx_opt.user_mss; + newtp->advmss = tcp_mss_clamp(tcp_sk(sk), dst_metric_advmss(dst)); tcp_initialize_rcv_mss(newsk); |