From: Geliang Tang <geliangtang@gmail.com>
Date: Mon, 22 Jun 2020 11:45:58 +0000 (+0800)
Subject: mptcp: drop sndr_key in mptcp_syn_options
X-Git-Tag: baikal/aarch64/sdk6.1~8998^2~32
X-Git-Url: https://git.baikalelectronics.ru/sdk/?a=commitdiff_plain;h=fa22314d8c644aa065fff457ffb7f72a13ca4b52;p=kernel.git

mptcp: drop sndr_key in mptcp_syn_options

In RFC 8684, we don't need to send sndr_key in SYN package anymore, so drop
it.

Fixes: be6fdbacfb2b ("mptcp: parse and emit MP_CAPABLE option according to v1 spec")
Signed-off-by: Geliang Tang <geliangtang@gmail.com>
Reviewed-by: Matthieu Baerts <matthieu.baerts@tessares.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/mptcp/options.c b/net/mptcp/options.c
index 490b92534afc3..df9a51425c6fc 100644
--- a/net/mptcp/options.c
+++ b/net/mptcp/options.c
@@ -336,9 +336,7 @@ bool mptcp_syn_options(struct sock *sk, const struct sk_buff *skb,
 	 */
 	subflow->snd_isn = TCP_SKB_CB(skb)->end_seq;
 	if (subflow->request_mptcp) {
-		pr_debug("local_key=%llu", subflow->local_key);
 		opts->suboptions = OPTION_MPTCP_MPC_SYN;
-		opts->sndr_key = subflow->local_key;
 		*size = TCPOLEN_MPTCP_MPC_SYN;
 		return true;
 	} else if (subflow->request_join) {