mptcp: drop argument port from mptcp_pm_announce_addr

Drop the redundant argument 'port' from mptcp_pm_announce_addr, use the
port field of another argument 'addr' instead.

Fixes: 0f5c9e3f079f ("mptcp: add port parameter for mptcp_pm_announce_addr")
Signed-off-by: Geliang Tang <geliangtang@gmail.com>
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 4cfd80f..51e6058 100644 (file)
--- a/net/mptcp/pm.c
+++ b/net/mptcp/pm.c
@@ -14,7 +14,7 @@
 
 int mptcp_pm_announce_addr(struct mptcp_sock *msk,
                           const struct mptcp_addr_info *addr,
-                          bool echo, bool port)
+                          bool echo)
 {
        u8 add_addr = READ_ONCE(msk->pm.addr_signal);
 
@@ -33,7 +33,7 @@ int mptcp_pm_announce_addr(struct mptcp_sock *msk,
                add_addr |= BIT(MPTCP_ADD_ADDR_ECHO);
        if (addr->family == AF_INET6)
                add_addr |= BIT(MPTCP_ADD_ADDR_IPV6);
-       if (port)
+       if (addr->port)
                add_addr |= BIT(MPTCP_ADD_ADDR_PORT);
        WRITE_ONCE(msk->pm.addr_signal, add_addr);
        return 0;
@@ -188,7 +188,7 @@ void mptcp_pm_add_addr_received(struct mptcp_sock *msk,
        spin_lock_bh(&pm->lock);
 
        if (!READ_ONCE(pm->accept_addr)) {
-               mptcp_pm_announce_addr(msk, addr, true, addr->port);
+               mptcp_pm_announce_addr(msk, addr, true);
                mptcp_pm_add_addr_send_ack(msk);
        } else if (mptcp_pm_schedule_work(msk, MPTCP_PM_ADD_ADDR_RECEIVED)) {
                pm->remote = *addr;

diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c
index 5857b82..53c09db 100644 (file)
--- a/net/mptcp/pm_netlink.c
+++ b/net/mptcp/pm_netlink.c
@@ -308,7 +308,7 @@ static void mptcp_pm_add_timer(struct timer_list *timer)
 
        if (!mptcp_pm_should_add_signal(msk)) {
                pr_debug("retransmit ADD_ADDR id=%d", entry->addr.id);
-               mptcp_pm_announce_addr(msk, &entry->addr, false, entry->addr.port);
+               mptcp_pm_announce_addr(msk, &entry->addr, false);
                mptcp_pm_add_addr_send_ack(msk);
                entry->retrans_times++;
        }
@@ -417,7 +417,7 @@ static void mptcp_pm_create_subflow_or_signal_addr(struct mptcp_sock *msk)
                if (local) {
                        if (mptcp_pm_alloc_anno_list(msk, local)) {
                                msk->pm.add_addr_signaled++;
-                               mptcp_pm_announce_addr(msk, &local->addr, false, local->addr.port);
+                               mptcp_pm_announce_addr(msk, &local->addr, false);
                                mptcp_pm_nl_add_addr_send_ack(msk);
                        }
                } else {
@@ -468,7 +468,6 @@ static void mptcp_pm_nl_add_addr_received(struct mptcp_sock *msk)
        struct mptcp_addr_info remote;
        struct mptcp_addr_info local;
        unsigned int subflows_max;
-       bool use_port = false;
 
        add_addr_accept_max = mptcp_pm_get_add_addr_accept_max(msk);
        subflows_max = mptcp_pm_get_subflows_max(msk);
@@ -488,8 +487,6 @@ static void mptcp_pm_nl_add_addr_received(struct mptcp_sock *msk)
        remote = msk->pm.remote;
        if (!remote.port)
                remote.port = sk->sk_dport;
-       else
-               use_port = true;
        memset(&local, 0, sizeof(local));
        local.family = remote.family;
 
@@ -497,7 +494,7 @@ static void mptcp_pm_nl_add_addr_received(struct mptcp_sock *msk)
        __mptcp_subflow_connect(sk, &local, &remote);
        spin_lock_bh(&msk->pm.lock);
 
-       mptcp_pm_announce_addr(msk, &remote, true, use_port);
+       mptcp_pm_announce_addr(msk, &msk->pm.remote, true);
        mptcp_pm_nl_add_addr_send_ack(msk);
 }
 

diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h
index 0116308..2bcd689 100644 (file)
--- a/net/mptcp/protocol.h
+++ b/net/mptcp/protocol.h
@@ -663,7 +663,7 @@ mptcp_pm_del_add_timer(struct mptcp_sock *msk,
 
 int mptcp_pm_announce_addr(struct mptcp_sock *msk,
                           const struct mptcp_addr_info *addr,
-                          bool echo, bool port);
+                          bool echo);
 int mptcp_pm_remove_addr(struct mptcp_sock *msk, const struct mptcp_rm_list *rm_list);
 int mptcp_pm_remove_subflow(struct mptcp_sock *msk, const struct mptcp_rm_list *rm_list);