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

mptcp: rename mptcp_pm_nl_add_addr_send_ack 



Since mptcp_pm_nl_add_addr_send_ack is now used for both ADD_ADDR and
RM_ADDR cases, rename it to mptcp_pm_nl_addr_send_ack.

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 8dd5efb1

net/mptcp/pm.c

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ int mptcp_pm_remove_addr(struct mptcp_sock *msk, const struct mptcp_rm_list *rm_ 
	msk->pm.rm_list_tx = *rm_list;

	rm_addr |= BIT(MPTCP_RM_ADDR_SIGNAL);

	WRITE_ONCE(msk->pm.addr_signal, rm_addr);

	mptcp_pm_nl_add_addr_send_ack(msk);

	mptcp_pm_nl_addr_send_ack(msk);

	return 0;

}

net/mptcp/pm_netlink.c

+4 −4
Original line number Diff line number Diff line
@@ -437,7 +437,7 @@ static void mptcp_pm_create_subflow_or_signal_addr(struct mptcp_sock *msk) 
			if (mptcp_pm_alloc_anno_list(msk, local)) {

				msk->pm.add_addr_signaled++;

				mptcp_pm_announce_addr(msk, &local->addr, false);

				mptcp_pm_nl_add_addr_send_ack(msk);

				mptcp_pm_nl_addr_send_ack(msk);

			}

		} else {

			/* pick failed, avoid fourther attempts later */
@@ -519,10 +519,10 @@ static void mptcp_pm_nl_add_addr_received(struct mptcp_sock *msk) 


add_addr_echo:

	mptcp_pm_announce_addr(msk, &msk->pm.remote, true);

	mptcp_pm_nl_add_addr_send_ack(msk);

	mptcp_pm_nl_addr_send_ack(msk);

}



void mptcp_pm_nl_add_addr_send_ack(struct mptcp_sock *msk)

void mptcp_pm_nl_addr_send_ack(struct mptcp_sock *msk)

{

	struct mptcp_subflow_context *subflow;
@@ -642,7 +642,7 @@ void mptcp_pm_nl_work(struct mptcp_sock *msk) 
	}

	if (pm->status & BIT(MPTCP_PM_ADD_ADDR_SEND_ACK)) {

		pm->status &= ~BIT(MPTCP_PM_ADD_ADDR_SEND_ACK);

		mptcp_pm_nl_add_addr_send_ack(msk);

		mptcp_pm_nl_addr_send_ack(msk);

	}

	if (pm->status & BIT(MPTCP_PM_RM_ADDR_RECEIVED)) {

		pm->status &= ~BIT(MPTCP_PM_RM_ADDR_RECEIVED);

net/mptcp/protocol.h

+1 −1
Original line number Diff line number Diff line
@@ -650,7 +650,7 @@ void mptcp_pm_add_addr_received(struct mptcp_sock *msk, 
void mptcp_pm_add_addr_echoed(struct mptcp_sock *msk,

			      struct mptcp_addr_info *addr);

void mptcp_pm_add_addr_send_ack(struct mptcp_sock *msk);

void mptcp_pm_nl_add_addr_send_ack(struct mptcp_sock *msk);

void mptcp_pm_nl_addr_send_ack(struct mptcp_sock *msk);

void mptcp_pm_rm_addr_received(struct mptcp_sock *msk,

			       const struct mptcp_rm_list *rm_list);

void mptcp_pm_mp_prio_received(struct sock *sk, u8 bkup);