diff options
| author | Paolo Abeni <pabeni@redhat.com> | 2020-04-20 16:25:06 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-04-20 12:59:33 -0700 |
| commit | fca5c82c086ea3871b103618b80558c479c8e597 (patch) | |
| tree | 17c80126ba1c7f588250d8cd7a18a8849915dfab /net/mptcp/protocol.h | |
| parent | 4c8941de781cf71388d1490c6b85a02d1cec1ef4 (diff) | |
| download | linux-fca5c82c086ea3871b103618b80558c479c8e597.tar.gz linux-fca5c82c086ea3871b103618b80558c479c8e597.tar.bz2 linux-fca5c82c086ea3871b103618b80558c479c8e597.zip | |
mptcp: drop req socket remote_key* fields
We don't need them, as we can use the current ingress opt
data instead. Setting them in syn_recv_sock() may causes
inconsistent mptcp socket status, as per previous commit.
Fixes: cc7972ea1932 ("mptcp: parse and emit MP_CAPABLE option according to v1 spec")
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mptcp/protocol.h')
| -rw-r--r-- | net/mptcp/protocol.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 67448002a2d7..a2b3048037d0 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -206,12 +206,10 @@ struct mptcp_subflow_request_sock { struct tcp_request_sock sk; u16 mp_capable : 1, mp_join : 1, - backup : 1, - remote_key_valid : 1; + backup : 1; u8 local_id; u8 remote_id; u64 local_key; - u64 remote_key; u64 idsn; u32 token; u32 ssn_offset; @@ -332,7 +330,9 @@ void mptcp_proto_init(void); int mptcp_proto_v6_init(void); #endif -struct sock *mptcp_sk_clone(const struct sock *sk, struct request_sock *req); +struct sock *mptcp_sk_clone(const struct sock *sk, + const struct tcp_options_received *opt_rx, + struct request_sock *req); void mptcp_get_options(const struct sk_buff *skb, struct tcp_options_received *opt_rx); |