| Message ID | 60f8315d6ae7b62d175c573f75cee50f14ce988b.1592826171.git.geliangtang@gmail.com |
|---|---|
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
| Series | [net,v2] mptcp: drop sndr_key in mptcp_syn_options | expand |
Hi Geliang, On 22/06/2020 13:45, Geliang Tang wrote: > In RFC 8684, we don't need to send sndr_key in SYN package anymore, so drop Please next time try to have max 72 chars per line in your commit message ;) > it. > > Fixes: cc7972ea1932 ("mptcp: parse and emit MP_CAPABLE option according to v1 spec") > Signed-off-by: Geliang Tang <geliangtang@gmail.com> Thank you for this v2. It looks good to me! Reviewed-by: Matthieu Baerts <matthieu.baerts@tessares.net> Cheers, Matt -- Tessares | Belgium | Hybrid Access Solutions www.tessares.net
From: Geliang Tang <geliangtang@gmail.com> Date: Mon, 22 Jun 2020 19:45:58 +0800 > In RFC 8684, we don't need to send sndr_key in SYN package anymore, so drop > it. > > Fixes: cc7972ea1932 ("mptcp: parse and emit MP_CAPABLE option according to v1 spec") > Signed-off-by: Geliang Tang <geliangtang@gmail.com> Applied and queued up for v5.6+ -stable, thanks.
diff --git a/net/mptcp/options.c b/net/mptcp/options.c index 490b92534afc..df9a51425c6f 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) {
In RFC 8684, we don't need to send sndr_key in SYN package anymore, so drop it. Fixes: cc7972ea1932 ("mptcp: parse and emit MP_CAPABLE option according to v1 spec") Signed-off-by: Geliang Tang <geliangtang@gmail.com> --- net/mptcp/options.c | 2 -- 1 file changed, 2 deletions(-)