mptcp: export local_address

commit dc886bce753cc2cf3c88ec5c7a6880a4e17d65ba upstream.

Rename local_address() with "mptcp_" prefix and export it in protocol.h.

This function will be re-used in the common PM code (pm.c) in the
following commit.

Signed-off-by: Geliang Tang <geliang.tang@suse.com>
Reviewed-by: Matthieu Baerts <matthieu.baerts@tessares.net>
Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net>
Reviewed-by: Larysa Zaremba <larysa.zaremba@intel.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Stable-dep-of: 6834097fc38c ("mptcp: pm: fix backup support in signal endpoints")
[ Conflicts in pm_netlink.c and protocol.h, because the context has
  changed in commit 4638de5aefe5 ("mptcp: handle local addrs announced
  by userspace PMs") which is not in this version. This commit is
  unrelated to this modification. ]
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c
index 67ece399ef60e90102ecddda28444fad0d21b9d8..37e9ff9b99f67d79834c0cbd31aac4173be89e97 100644 (file)
--- a/net/mptcp/pm_netlink.c
+++ b/net/mptcp/pm_netlink.c
@@ -97,8 +97,7 @@ static bool address_zero(const struct mptcp_addr_info *addr)
        return addresses_equal(addr, &zero, true);
 }
 
-static void local_address(const struct sock_common *skc,
-                         struct mptcp_addr_info *addr)
+void mptcp_local_address(const struct sock_common *skc, struct mptcp_addr_info *addr)
 {
        addr->family = skc->skc_family;
        addr->port = htons(skc->skc_num);
@@ -133,7 +132,7 @@ static bool lookup_subflow_by_saddr(const struct list_head *list,
        list_for_each_entry(subflow, list, node) {
                skc = (struct sock_common *)mptcp_subflow_tcp_sock(subflow);
 
-               local_address(skc, &cur);
+               mptcp_local_address(skc, &cur);
                if (addresses_equal(&cur, saddr, saddr->port))
                        return true;
        }
@@ -286,7 +285,7 @@ bool mptcp_pm_sport_in_anno_list(struct mptcp_sock *msk, const struct sock *sk)
        struct mptcp_addr_info saddr;
        bool ret = false;
 
-       local_address((struct sock_common *)sk, &saddr);
+       mptcp_local_address((struct sock_common *)sk, &saddr);
 
        spin_lock_bh(&msk->pm.lock);
        list_for_each_entry(entry, &msk->pm.anno_list, list) {
@@ -693,7 +692,7 @@ int mptcp_pm_nl_mp_prio_send_ack(struct mptcp_sock *msk,
                struct sock *sk = (struct sock *)msk;
                struct mptcp_addr_info local;
 
-               local_address((struct sock_common *)ssk, &local);
+               mptcp_local_address((struct sock_common *)ssk, &local);
                if (!addresses_equal(&local, addr, addr->port))
                        continue;
 
@@ -976,8 +975,8 @@ int mptcp_pm_nl_get_local_id(struct mptcp_sock *msk, struct sock_common *skc)
        /* The 0 ID mapping is defined by the first subflow, copied into the msk
         * addr
         */
-       local_address((struct sock_common *)msk, &msk_local);
-       local_address((struct sock_common *)skc, &skc_local);
+       mptcp_local_address((struct sock_common *)msk, &msk_local);
+       mptcp_local_address((struct sock_common *)skc, &skc_local);
        if (addresses_equal(&msk_local, &skc_local, false))
                return 0;
 
@@ -1388,7 +1387,7 @@ static int mptcp_nl_remove_id_zero_address(struct net *net,
                if (list_empty(&msk->conn_list))
                        goto next;
 
-               local_address((struct sock_common *)msk, &msk_local);
+               mptcp_local_address((struct sock_common *)msk, &msk_local);
                if (!addresses_equal(&msk_local, addr, addr->port))
                        goto next;
 

diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h
index d2e68f5c62884455ef88406063e9893ce33b88e0..0f82d75e3d201764a456bf76d77a477a24f36648 100644 (file)
--- a/net/mptcp/protocol.h
+++ b/net/mptcp/protocol.h
@@ -583,6 +583,7 @@ void mptcp_subflow_send_ack(struct sock *ssk);
 void mptcp_subflow_reset(struct sock *ssk);
 void mptcp_sock_graft(struct sock *sk, struct socket *parent);
 struct socket *__mptcp_nmpc_socket(const struct mptcp_sock *msk);
+void mptcp_local_address(const struct sock_common *skc, struct mptcp_addr_info *addr);
 
 /* called with sk socket lock held */
 int __mptcp_subflow_connect(struct sock *sk, const struct mptcp_addr_info *loc,