Skip to content

Commit 18f60dc

Browse files
matttbeintel-lab-lkp
authored andcommitted
mptcp: pm: remove '_nl' from mptcp_pm_nl_is_init_remote_addr
Currently, in-kernel PM specific helpers are prefixed with 'mptcp_pm_nl_'. But here 'mptcp_pm_nl_is_init_remote_addr' is not specific to this PM: it is called from pm.c for both the in-kernel and userspace PMs. To avoid confusions, the '_nl' bit has been removed from the name. No behavioural changes intended. Signed-off-by: Matthieu Baerts (NGI0) <[email protected]>
1 parent b109436 commit 18f60dc

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

net/mptcp/pm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ void mptcp_pm_add_addr_received(const struct sock *ssk,
231231
__MPTCP_INC_STATS(sock_net((struct sock *)msk), MPTCP_MIB_ADDADDRDROP);
232232
}
233233
/* id0 should not have a different address */
234-
} else if ((addr->id == 0 && !mptcp_pm_nl_is_init_remote_addr(msk, addr)) ||
234+
} else if ((addr->id == 0 && !mptcp_pm_is_init_remote_addr(msk, addr)) ||
235235
(addr->id > 0 && !READ_ONCE(pm->accept_addr))) {
236236
mptcp_pm_announce_addr(msk, addr, true);
237237
mptcp_pm_add_addr_send_ack(msk);

net/mptcp/pm_netlink.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -772,8 +772,8 @@ static void mptcp_pm_nl_add_addr_received(struct mptcp_sock *msk)
772772
}
773773
}
774774

775-
bool mptcp_pm_nl_is_init_remote_addr(struct mptcp_sock *msk,
776-
const struct mptcp_addr_info *remote)
775+
bool mptcp_pm_is_init_remote_addr(struct mptcp_sock *msk,
776+
const struct mptcp_addr_info *remote)
777777
{
778778
struct mptcp_addr_info mpc_remote;
779779

net/mptcp/protocol.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1011,8 +1011,8 @@ void mptcp_pm_add_addr_received(const struct sock *ssk,
10111011
void mptcp_pm_add_addr_echoed(struct mptcp_sock *msk,
10121012
const struct mptcp_addr_info *addr);
10131013
void mptcp_pm_add_addr_send_ack(struct mptcp_sock *msk);
1014-
bool mptcp_pm_nl_is_init_remote_addr(struct mptcp_sock *msk,
1015-
const struct mptcp_addr_info *remote);
1014+
bool mptcp_pm_is_init_remote_addr(struct mptcp_sock *msk,
1015+
const struct mptcp_addr_info *remote);
10161016
void mptcp_pm_addr_send_ack(struct mptcp_sock *msk);
10171017
void mptcp_pm_rm_addr_received(struct mptcp_sock *msk,
10181018
const struct mptcp_rm_list *rm_list);

0 commit comments

Comments
 (0)