Skip to content

Commit 795a8f6

Browse files
Geliang Tangintel-lab-lkp
authored andcommitted
mptcp: pm: in-kernel: reduce parameters of set_flags
The number of parameters in mptcp_nl_set_flags() can be reduced. Only need to pass a "local" parameter to it instead of "local->addr" and "local->flags". Signed-off-by: Geliang Tang <[email protected]>
1 parent d26e2f4 commit 795a8f6

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

net/mptcp/pm_netlink.c

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1907,11 +1907,12 @@ static void mptcp_pm_nl_fullmesh(struct mptcp_sock *msk,
19071907
spin_unlock_bh(&msk->pm.lock);
19081908
}
19091909

1910-
static void mptcp_nl_set_flags(struct net *net, struct mptcp_addr_info *addr,
1911-
u8 flags, u8 changed)
1910+
static void mptcp_nl_set_flags(struct net *net,
1911+
struct mptcp_pm_addr_entry *local,
1912+
u8 changed)
19121913
{
1913-
u8 is_subflow = !!(flags & MPTCP_PM_ADDR_FLAG_SUBFLOW);
1914-
u8 bkup = !!(flags & MPTCP_PM_ADDR_FLAG_BACKUP);
1914+
u8 is_subflow = !!(local->flags & MPTCP_PM_ADDR_FLAG_SUBFLOW);
1915+
u8 bkup = !!(local->flags & MPTCP_PM_ADDR_FLAG_BACKUP);
19151916
long s_slot = 0, s_num = 0;
19161917
struct mptcp_sock *msk;
19171918

@@ -1926,10 +1927,10 @@ static void mptcp_nl_set_flags(struct net *net, struct mptcp_addr_info *addr,
19261927

19271928
lock_sock(sk);
19281929
if (changed & MPTCP_PM_ADDR_FLAG_BACKUP)
1929-
mptcp_pm_nl_mp_prio_send_ack(msk, addr, NULL, bkup);
1930+
mptcp_pm_nl_mp_prio_send_ack(msk, &local->addr, NULL, bkup);
19301931
/* Subflows will only be recreated if the SUBFLOW flag is set */
19311932
if (is_subflow && (changed & MPTCP_PM_ADDR_FLAG_FULLMESH))
1932-
mptcp_pm_nl_fullmesh(msk, addr);
1933+
mptcp_pm_nl_fullmesh(msk, &local->addr);
19331934
release_sock(sk);
19341935

19351936
next:
@@ -1983,7 +1984,7 @@ int mptcp_pm_nl_set_flags(struct mptcp_pm_addr_entry *local,
19831984
*local = *entry;
19841985
spin_unlock_bh(&pernet->lock);
19851986

1986-
mptcp_nl_set_flags(net, &local->addr, local->flags, changed);
1987+
mptcp_nl_set_flags(net, local, changed);
19871988
return 0;
19881989
}
19891990

0 commit comments

Comments
 (0)