options.c (761c124ed9698581e88d7babb9001401724435dd) options.c (07f8252fe0e3c2b6320eeff18bdc5b7fb8845cb3)
1// SPDX-License-Identifier: GPL-2.0
2/* Multipath TCP
3 *
4 * Copyright (c) 2017 - 2019, Intel Corporation.
5 */
6
7#define pr_fmt(fmt) "MPTCP: " fmt
8

--- 610 unchanged lines hidden (view full) ---

619 struct mptcp_sock *msk = mptcp_sk(subflow->conn);
620 bool drop_other_suboptions = false;
621 unsigned int opt_size = *size;
622 bool echo;
623 bool port;
624 int len;
625
626 if ((mptcp_pm_should_add_signal_ipv6(msk) ||
1// SPDX-License-Identifier: GPL-2.0
2/* Multipath TCP
3 *
4 * Copyright (c) 2017 - 2019, Intel Corporation.
5 */
6
7#define pr_fmt(fmt) "MPTCP: " fmt
8

--- 610 unchanged lines hidden (view full) ---

619 struct mptcp_sock *msk = mptcp_sk(subflow->conn);
620 bool drop_other_suboptions = false;
621 unsigned int opt_size = *size;
622 bool echo;
623 bool port;
624 int len;
625
626 if ((mptcp_pm_should_add_signal_ipv6(msk) ||
627 mptcp_pm_should_add_signal_port(msk)) &&
627 mptcp_pm_should_add_signal_port(msk) ||
628 mptcp_pm_should_add_signal_echo(msk)) &&
628 skb && skb_is_tcp_pure_ack(skb)) {
629 pr_debug("drop other suboptions");
630 opts->suboptions = 0;
631 opts->ext_copy.use_ack = 0;
632 opts->ext_copy.use_map = 0;
633 remaining += opt_size;
634 drop_other_suboptions = true;
635 }

--- 710 unchanged lines hidden --- 		629 skb && skb_is_tcp_pure_ack(skb)) {
630 pr_debug("drop other suboptions");
631 opts->suboptions = 0;
632 opts->ext_copy.use_ack = 0;
633 opts->ext_copy.use_map = 0;
634 remaining += opt_size;
635 drop_other_suboptions = true;
636 }

--- 710 unchanged lines hidden ---