mptcp: drop port parameter of mptcp_pm_add_addr_signal

Drop the port parameter of mptcp_pm_add_addr_signal() and reflect it to
avoid passing too many parameters.

Signed-off-by: Geliang Tang <geliang.tang@suse.com>
Signed-off-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/net/mptcp/options.c b/net/mptcp/options.c
index 5a14420b77c808c70e37354616653bb6b18ce06f..ac10a04ccd7ccbc1a0e65f3a21c6f34583b821df 100644 (file)
--- a/net/mptcp/options.c
+++ b/net/mptcp/options.c
@@ -652,7 +652,6 @@ static bool mptcp_established_options_add_addr(struct sock *sk, struct sk_buff *
        bool drop_other_suboptions = false;
        unsigned int opt_size = *size;
        bool echo;
-       bool port;
        int len;
 
        /* add addr will strip the existing options, be sure to avoid breaking
@@ -661,12 +660,12 @@ static bool mptcp_established_options_add_addr(struct sock *sk, struct sk_buff *
        if (!mptcp_pm_should_add_signal(msk) ||
            (opts->suboptions & (OPTION_MPTCP_MPJ_ACK | OPTION_MPTCP_MPC_ACK)) ||
            !mptcp_pm_add_addr_signal(msk, skb, opt_size, remaining, &opts->addr,
-                   &echo, &port, &drop_other_suboptions))
+                   &echo, &drop_other_suboptions))
                return false;
 
        if (drop_other_suboptions)
                remaining += opt_size;
-       len = mptcp_add_addr_len(opts->addr.family, echo, port);
+       len = mptcp_add_addr_len(opts->addr.family, echo, !!opts->addr.port);
        if (remaining < len)
                return false;
 

diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c
index 696b2c4613a7c4e2c065a51ed77532dadec6ceeb..ef6e4adeb0e507cfb101e371bb922413401aa0df 100644 (file)
--- a/net/mptcp/pm.c
+++ b/net/mptcp/pm.c
@@ -278,11 +278,12 @@ void mptcp_pm_mp_fail_received(struct sock *sk, u64 fail_seq)
 bool mptcp_pm_add_addr_signal(struct mptcp_sock *msk, struct sk_buff *skb,
                              unsigned int opt_size, unsigned int remaining,
                              struct mptcp_addr_info *addr, bool *echo,
-                             bool *port, bool *drop_other_suboptions)
+                             bool *drop_other_suboptions)
 {
        int ret = false;
        u8 add_addr;
        u8 family;
+       bool port;
 
        spin_lock_bh(&msk->pm.lock);
 
@@ -300,10 +301,10 @@ bool mptcp_pm_add_addr_signal(struct mptcp_sock *msk, struct sk_buff *skb,
        }
 
        *echo = mptcp_pm_should_add_signal_echo(msk);
-       *port = !!(*echo ? msk->pm.remote.port : msk->pm.local.port);
+       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))
+       if (remaining < mptcp_add_addr_len(family, *echo, port))
                goto out_unlock;
 
        if (*echo) {

diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h
index a23694ad69e7c5d009b8fdb4f1d00be0cadbbf2a..e381054910d0228f3507f37488bf5efe816443ab 100644 (file)
--- a/net/mptcp/protocol.h
+++ b/net/mptcp/protocol.h
@@ -818,7 +818,7 @@ static inline int mptcp_rm_addr_len(const struct mptcp_rm_list *rm_list)
 bool mptcp_pm_add_addr_signal(struct mptcp_sock *msk, struct sk_buff *skb,
                              unsigned int opt_size, unsigned int remaining,
                              struct mptcp_addr_info *addr, bool *echo,
-                             bool *port, bool *drop_other_suboptions);
+                             bool *drop_other_suboptions);
 bool mptcp_pm_rm_addr_signal(struct mptcp_sock *msk, unsigned int remaining,
                             struct mptcp_rm_list *rm_list);
 int mptcp_pm_get_local_id(struct mptcp_sock *msk, struct sock_common *skc);