mptcp: drop all sub-options except ADD_ADDR when the echo bit is set

[linux-2.6-microblaze.git] / net / mptcp / options.c

diff --git a/net/mptcp/options.c b/net/mptcp/options.c
index c7eb61d..d51c3ad 100644 (file)
--- a/net/mptcp/options.c
+++ b/net/mptcp/options.c
@@ -624,7 +624,8 @@ static bool mptcp_established_options_add_addr(struct sock *sk, struct sk_buff *
        int len;
 
        if ((mptcp_pm_should_add_signal_ipv6(msk) ||
-            mptcp_pm_should_add_signal_port(msk)) &&
+            mptcp_pm_should_add_signal_port(msk) ||
+            mptcp_pm_should_add_signal_echo(msk)) &&
            skb && skb_is_tcp_pure_ack(skb)) {
                pr_debug("drop other suboptions");
                opts->suboptions = 0;