Skip to content

Commit b109436

Browse files
matttbeintel-lab-lkp
authored andcommitted
mptcp: pm: remove '_nl' from mptcp_pm_nl_subflow_chk_stale()
Currently, in-kernel PM specific helpers are prefixed with 'mptcp_pm_nl_'. But here 'mptcp_pm_nl_subflow_chk_stale' 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 4e6b7c2 commit b109436

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

net/mptcp/pm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -567,7 +567,7 @@ void mptcp_pm_subflow_chk_stale(const struct mptcp_sock *msk, struct sock *ssk)
567567
} else if (subflow->stale_rcv_tstamp == rcv_tstamp) {
568568
if (subflow->stale_count < U8_MAX)
569569
subflow->stale_count++;
570-
mptcp_pm_nl_subflow_chk_stale(msk, ssk);
570+
mptcp_pm_subflows_chk_stale(msk, ssk);
571571
} else {
572572
subflow->stale_count = 0;
573573
mptcp_subflow_set_active(subflow);

net/mptcp/pm_netlink.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1203,7 +1203,7 @@ static const struct genl_multicast_group mptcp_pm_mcgrps[] = {
12031203
},
12041204
};
12051205

1206-
void mptcp_pm_nl_subflow_chk_stale(const struct mptcp_sock *msk, struct sock *ssk)
1206+
void mptcp_pm_subflows_chk_stale(const struct mptcp_sock *msk, struct sock *ssk)
12071207
{
12081208
struct mptcp_subflow_context *iter, *subflow = mptcp_subflow_ctx(ssk);
12091209
struct sock *sk = (struct sock *)msk;

net/mptcp/protocol.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -997,7 +997,7 @@ bool mptcp_pm_addr_families_match(const struct sock *sk,
997997
const struct mptcp_addr_info *loc,
998998
const struct mptcp_addr_info *rem);
999999
void mptcp_pm_subflow_chk_stale(const struct mptcp_sock *msk, struct sock *ssk);
1000-
void mptcp_pm_nl_subflow_chk_stale(const struct mptcp_sock *msk, struct sock *ssk);
1000+
void mptcp_pm_subflows_chk_stale(const struct mptcp_sock *msk, struct sock *ssk);
10011001
void mptcp_pm_new_connection(struct mptcp_sock *msk, const struct sock *ssk, int server_side);
10021002
void mptcp_pm_fully_established(struct mptcp_sock *msk, const struct sock *ssk);
10031003
bool mptcp_pm_allow_new_subflow(struct mptcp_sock *msk);

0 commit comments

Comments
 (0)