Commit 13ad9f01 authored by Geliang Tang's avatar Geliang Tang Committed by David S. Miller
Browse files

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: default avatarGeliang Tang <geliangtang@gmail.com>
Signed-off-by: default avatarMat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 42842a42

net/mptcp/pm.c

+7 −7
Original line number Diff line number Diff line
@@ -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;

net/mptcp/pm_netlink.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

	}

}

net/mptcp/protocol.h

+7 −7
Original line number Diff line number Diff line
@@ -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)