diff options
| author |   Paolo Abeni <pabeni@redhat.com> | 2020-04-30 15:01:51 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2020-04-30 12:23:22 -0700 |
| commit | 263e1201a2c324b60b15ecda5de9ebf1e7293e31 (patch) | |
| tree | 6c996b8bc10e5d5ca261b1239e0bb4685626c072 /net/ipv4 | |
| parent | Merge branch 'wireguard-fixes' (diff) | |
| download | linux-dev-263e1201a2c324b60b15ecda5de9ebf1e7293e31.tar.xz linux-dev-263e1201a2c324b60b15ecda5de9ebf1e7293e31.zip | |
mptcp: consolidate synack processing.
Currently the MPTCP code uses 2 hooks to process syn-ack
packets, mptcp_rcv_synsent() and the sk_rx_dst_set()
callback.
We can drop the first, moving the relevant code into the
latter, reducing the hooking into the TCP code. This is
also needed by the next patch.
v1 -> v2:
- use local tcp sock ptr instead of casting the sk variable
several times - DaveM
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
| -rw-r--r-- | net/ipv4/tcp_input.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index bf4ced9273e8..81425542da44 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c @@ -5990,9 +5990,6 @@ static int tcp_rcv_synsent_state_process(struct sock *sk, struct sk_buff *skb, tcp_sync_mss(sk, icsk->icsk_pmtu_cookie); tcp_initialize_rcv_mss(sk); - if (sk_is_mptcp(sk)) - mptcp_rcv_synsent(sk); - /* Remember, tcp_poll() does not lock socket! * Change state from SYN-SENT only after copied_seq * is initialized. */ |