mptcp: rename add_addr_signal and mptcp_add_addr_status

Since the RM_ADDR signal had been reused with add_addr_signal, it's not
suitable to call it add_addr_signal or mptcp_add_addr_status. So this
patch renamed add_addr_signal to addr_signal, and renamed
mptcp_add_addr_status to mptcp_addr_signal_status.

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 09d6e736161dff2cb45529fdf9ba61d631f47380..9256bd5d02ed16bc8c4cd9ba77e33400748f9627 100644 (file)
--- a/net/mptcp/pm.c
+++ b/net/mptcp/pm.c
@@ -16,7 +16,7 @@ int mptcp_pm_announce_addr(struct mptcp_sock *msk,
                           const struct mptcp_addr_info *addr,
                           bool echo, bool port)
 {
-       u8 add_addr = READ_ONCE(msk->pm.add_addr_signal);
+       u8 add_addr = READ_ONCE(msk->pm.addr_signal);
 
        pr_debug("msk=%p, local_id=%d", msk, addr->id);
 
@@ -33,13 +33,13 @@ int mptcp_pm_announce_addr(struct mptcp_sock *msk,
                add_addr |= BIT(MPTCP_ADD_ADDR_IPV6);
        if (port)
                add_addr |= BIT(MPTCP_ADD_ADDR_PORT);
-       WRITE_ONCE(msk->pm.add_addr_signal, add_addr);
+       WRITE_ONCE(msk->pm.addr_signal, add_addr);
        return 0;
 }
 
 int mptcp_pm_remove_addr(struct mptcp_sock *msk, u8 local_id)
 {
-       u8 rm_addr = READ_ONCE(msk->pm.add_addr_signal);
+       u8 rm_addr = READ_ONCE(msk->pm.addr_signal);
 
        pr_debug("msk=%p, local_id=%d", msk, local_id);
 
@@ -50,7 +50,7 @@ int mptcp_pm_remove_addr(struct mptcp_sock *msk, u8 local_id)
 
        msk->pm.rm_id = local_id;
        rm_addr |= BIT(MPTCP_RM_ADDR_SIGNAL);
-       WRITE_ONCE(msk->pm.add_addr_signal, rm_addr);
+       WRITE_ONCE(msk->pm.addr_signal, rm_addr);
        return 0;
 }
 
@@ -221,7 +221,7 @@ bool mptcp_pm_add_addr_signal(struct mptcp_sock *msk, unsigned int remaining,
                goto out_unlock;
 
        *saddr = msk->pm.local;
-       WRITE_ONCE(msk->pm.add_addr_signal, 0);
+       WRITE_ONCE(msk->pm.addr_signal, 0);
        ret = true;
 
 out_unlock:
@@ -244,7 +244,7 @@ bool mptcp_pm_rm_addr_signal(struct mptcp_sock *msk, unsigned int remaining,
                goto out_unlock;
 
        *rm_id = msk->pm.rm_id;
-       WRITE_ONCE(msk->pm.add_addr_signal, 0);
+       WRITE_ONCE(msk->pm.addr_signal, 0);
        ret = true;
 
 out_unlock:
@@ -265,7 +265,7 @@ void mptcp_pm_data_init(struct mptcp_sock *msk)
        msk->pm.subflows = 0;
        msk->pm.rm_id = 0;
        WRITE_ONCE(msk->pm.work_pending, false);
-       WRITE_ONCE(msk->pm.add_addr_signal, 0);
+       WRITE_ONCE(msk->pm.addr_signal, 0);
        WRITE_ONCE(msk->pm.accept_addr, false);
        WRITE_ONCE(msk->pm.accept_subflow, false);
        msk->pm.status = 0;

diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c
index 2560c502356b870a152d2d03a803b439302dfba1..46da9f8c9cba975d2192f8fd1b00108f74390572 100644 (file)
--- a/net/mptcp/pm_netlink.c
+++ b/net/mptcp/pm_netlink.c
@@ -431,12 +431,12 @@ void mptcp_pm_nl_add_addr_send_ack(struct mptcp_sock *msk)
                release_sock(ssk);
                spin_lock_bh(&msk->pm.lock);
 
-               add_addr = READ_ONCE(msk->pm.add_addr_signal);
+               add_addr = READ_ONCE(msk->pm.addr_signal);
                if (mptcp_pm_should_add_signal_ipv6(msk))
                        add_addr &= ~BIT(MPTCP_ADD_ADDR_IPV6);
                if (mptcp_pm_should_add_signal_port(msk))
                        add_addr &= ~BIT(MPTCP_ADD_ADDR_PORT);
-               WRITE_ONCE(msk->pm.add_addr_signal, add_addr);
+               WRITE_ONCE(msk->pm.addr_signal, add_addr);
        }
 }
 

diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h
index f002c12beb98ce3e3ae968ea90751fcd679a95b8..9ff6fd486db64f86bb53719807df6c520c9c74aa 100644 (file)
--- a/net/mptcp/protocol.h
+++ b/net/mptcp/protocol.h
@@ -168,7 +168,7 @@ enum mptcp_pm_status {
        MPTCP_PM_SUBFLOW_ESTABLISHED,
 };
 
-enum mptcp_add_addr_status {
+enum mptcp_addr_signal_status {
        MPTCP_ADD_ADDR_SIGNAL,
        MPTCP_ADD_ADDR_ECHO,
        MPTCP_ADD_ADDR_IPV6,
@@ -183,7 +183,7 @@ struct mptcp_pm_data {
 
        spinlock_t      lock;           /*protects the whole PM data */
 
-       u8              add_addr_signal;
+       u8              addr_signal;
        bool            server_side;
        bool            work_pending;
        bool            accept_addr;
@@ -558,27 +558,27 @@ int mptcp_pm_remove_subflow(struct mptcp_sock *msk, u8 local_id);
 
 static inline bool mptcp_pm_should_add_signal(struct mptcp_sock *msk)
 {
-       return READ_ONCE(msk->pm.add_addr_signal) & BIT(MPTCP_ADD_ADDR_SIGNAL);
+       return READ_ONCE(msk->pm.addr_signal) & BIT(MPTCP_ADD_ADDR_SIGNAL);
 }
 
 static inline bool mptcp_pm_should_add_signal_echo(struct mptcp_sock *msk)
 {
-       return READ_ONCE(msk->pm.add_addr_signal) & BIT(MPTCP_ADD_ADDR_ECHO);
+       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.add_addr_signal) & BIT(MPTCP_ADD_ADDR_IPV6);
+       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.add_addr_signal) & BIT(MPTCP_ADD_ADDR_PORT);
+       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.add_addr_signal) & BIT(MPTCP_RM_ADDR_SIGNAL);
+       return READ_ONCE(msk->pm.addr_signal) & BIT(MPTCP_RM_ADDR_SIGNAL);
 }
 
 static inline unsigned int mptcp_add_addr_len(int family, bool echo, bool port)