| Message ID | 324b7fd5919dc934355ce13da4c71dc26e0aba8a.1606102511.git.geliangtang@gmail.com |
|---|---|
| State | Accepted, archived |
| Commit | 2d7ef2938b201a437c2746036191ea6115df59e9 |
| Delegated to: | Matthieu Baerts |
| Headers | show |
| Series | [net-next] mptcp: use the variable sk instead of open-coding | expand |
Hi Geliang, On 23/11/2020 04:37, Geliang Tang wrote: > Since the local variable sk has been defined, use it instead of > open-coding. Thank you for the cleanup! Just added at the end of the tree. - 2d7ef2938b20: mptcp: use the variable sk instead of open-coding - Results: 5e15564c598e..e91e7cc78e40 Tests + export are in progress! Cheers, Matt
diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c index 03f2c28f11f5..69c66e252588 100644 --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -313,7 +313,7 @@ static void mptcp_pm_create_subflow_or_signal_addr(struct mptcp_sock *msk) struct mptcp_pm_addr_entry *local; struct pm_nl_pernet *pernet; - pernet = net_generic(sock_net((struct sock *)msk), pm_nl_pernet_id); + pernet = net_generic(sock_net(sk), pm_nl_pernet_id); pr_debug("local %d:%d signal %d:%d subflows %d:%d\n", msk->pm.local_addr_used, msk->pm.local_addr_max, @@ -396,7 +396,7 @@ void mptcp_pm_nl_add_addr_received(struct mptcp_sock *msk) local.family = remote.family; spin_unlock_bh(&msk->pm.lock); - __mptcp_subflow_connect((struct sock *)msk, &local, &remote); + __mptcp_subflow_connect(sk, &local, &remote); spin_lock_bh(&msk->pm.lock); mptcp_pm_announce_addr(msk, &remote, true);
Since the local variable sk has been defined, use it instead of open-coding. Signed-off-by: Geliang Tang <geliangtang@gmail.com> --- net/mptcp/pm_netlink.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)