mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

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: 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>
This commit is contained in:
Geliang Tang 2021-03-26 11:26:41 -07:00 committed by David S. Miller
parent 8dd5efb1f9
commit b46a023810
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/mptcp/pm.c
View File

@ -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; msk->pm.rm_list_tx = *rm_list;
rm_addr |= BIT(MPTCP_RM_ADDR_SIGNAL); rm_addr |= BIT(MPTCP_RM_ADDR_SIGNAL);
WRITE_ONCE(msk->pm.addr_signal, rm_addr); 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; return 0;
} }

8
net/mptcp/pm_netlink.c
View File

@ -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)) { if (mptcp_pm_alloc_anno_list(msk, local)) {
msk->pm.add_addr_signaled++; msk->pm.add_addr_signaled++;
mptcp_pm_announce_addr(msk, &local->addr, false); mptcp_pm_announce_addr(msk, &local->addr, false);
mptcp_pm_nl_add_addr_send_ack(msk); mptcp_pm_nl_addr_send_ack(msk);
} }
} else { } else {
/* pick failed, avoid fourther attempts later */ /* 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: add_addr_echo:
mptcp_pm_announce_addr(msk, &msk->pm.remote, true); 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; 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)) { if (pm->status & BIT(MPTCP_PM_ADD_ADDR_SEND_ACK)) {
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)) { if (pm->status & BIT(MPTCP_PM_RM_ADDR_RECEIVED)) {
pm->status &= ~BIT(MPTCP_PM_RM_ADDR_RECEIVED); pm->status &= ~BIT(MPTCP_PM_RM_ADDR_RECEIVED);

2
net/mptcp/protocol.h
View File

@ -650,7 +650,7 @@ void mptcp_pm_add_addr_received(struct mptcp_sock *msk,
void mptcp_pm_add_addr_echoed(struct mptcp_sock *msk, void mptcp_pm_add_addr_echoed(struct mptcp_sock *msk,
struct mptcp_addr_info *addr); struct mptcp_addr_info *addr);
void mptcp_pm_add_addr_send_ack(struct mptcp_sock *msk); 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, void mptcp_pm_rm_addr_received(struct mptcp_sock *msk,
const struct mptcp_rm_list *rm_list); const struct mptcp_rm_list *rm_list);
void mptcp_pm_mp_prio_received(struct sock *sk, u8 bkup); void mptcp_pm_mp_prio_received(struct sock *sk, u8 bkup);