mptcp: remove MPTCP_ADD_ADDR_IPV6 and MPTCP_ADD_ADDR_PORT

MPTCP_ADD_ADDR_IPV6 and MPTCP_ADD_ADDR_PORT are not necessary, we can get
these info from pm.local or pm.remote.

Drop mptcp_pm_should_add_signal_ipv6 and mptcp_pm_should_add_signal_port
too.

Co-developed-by: Geliang Tang <geliangtang@gmail.com>
Signed-off-by: Geliang Tang <geliangtang@gmail.com>
Signed-off-by: Yonglong Li <liyonglong@chinatelecom.cn>
Signed-off-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c
index f1b520df228a72b8aadc9959641adac46a1b7b3b..da0c4c925350e6f7a0e68620059962e4890f2a78 100644 (file)
--- a/net/mptcp/pm.c
+++ b/net/mptcp/pm.c
@@ -37,10 +37,6 @@ int mptcp_pm_announce_addr(struct mptcp_sock *msk,
                msk->pm.local = *addr;
                add_addr |= BIT(MPTCP_ADD_ADDR_SIGNAL);
        }
-       if (addr->family == AF_INET6)
-               add_addr |= BIT(MPTCP_ADD_ADDR_IPV6);
-       if (addr->port)
-               add_addr |= BIT(MPTCP_ADD_ADDR_PORT);
        WRITE_ONCE(msk->pm.addr_signal, add_addr);
        return 0;
 }
@@ -280,7 +276,7 @@ bool mptcp_pm_add_addr_signal(struct mptcp_sock *msk, struct sk_buff *skb,
        }
 
        *echo = mptcp_pm_should_add_signal_echo(msk);
-       *port = mptcp_pm_should_add_signal_port(msk);
+       *port = !!(*echo ? msk->pm.remote.port : msk->pm.local.port);
 
        family = *echo ? msk->pm.remote.family : msk->pm.local.family;
        if (remaining < mptcp_add_addr_len(family, *echo, *port))

diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c
index d8dfd872a6dd3e16f6b414e5d606892dbbd44215..1e4289c507ffbaf256e3dd4412247102ffb6b926 100644 (file)
--- a/net/mptcp/pm_netlink.c
+++ b/net/mptcp/pm_netlink.c
@@ -647,10 +647,8 @@ void mptcp_pm_nl_addr_send_ack(struct mptcp_sock *msk)
                bool slow;
 
                spin_unlock_bh(&msk->pm.lock);
-               pr_debug("send ack for %s%s%s",
-                        mptcp_pm_should_add_signal(msk) ? "add_addr" : "rm_addr",
-                        mptcp_pm_should_add_signal_ipv6(msk) ? " [ipv6]" : "",
-                        mptcp_pm_should_add_signal_port(msk) ? " [port]" : "");
+               pr_debug("send ack for %s",
+                        mptcp_pm_should_add_signal(msk) ? "add_addr" : "rm_addr");
 
                slow = lock_sock_fast(ssk);
                tcp_send_ack(ssk);

diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h
index 27afacb6fde27e279495d760ec93779ff9d4aedc..7cd3d5979bcd894c4012246a0ba06c0237b3fc28 100644 (file)
--- a/net/mptcp/protocol.h
+++ b/net/mptcp/protocol.h
@@ -178,8 +178,6 @@ enum mptcp_pm_status {
 enum mptcp_addr_signal_status {
        MPTCP_ADD_ADDR_SIGNAL,
        MPTCP_ADD_ADDR_ECHO,
-       MPTCP_ADD_ADDR_IPV6,
-       MPTCP_ADD_ADDR_PORT,
        MPTCP_RM_ADDR_SIGNAL,
 };
 
@@ -762,16 +760,6 @@ static inline bool mptcp_pm_should_add_signal_echo(struct mptcp_sock *msk)
        return READ_ONCE(msk->pm.addr_signal) & BIT(MPTCP_ADD_ADDR_ECHO);
 }
 
-static inline bool mptcp_pm_should_add_signal_ipv6(struct mptcp_sock *msk)
-{
-       return READ_ONCE(msk->pm.addr_signal) & BIT(MPTCP_ADD_ADDR_IPV6);
-}
-
-static inline bool mptcp_pm_should_add_signal_port(struct mptcp_sock *msk)
-{
-       return READ_ONCE(msk->pm.addr_signal) & BIT(MPTCP_ADD_ADDR_PORT);
-}
-
 static inline bool mptcp_pm_should_rm_signal(struct mptcp_sock *msk)
 {
        return READ_ONCE(msk->pm.addr_signal) & BIT(MPTCP_RM_ADDR_SIGNAL);