diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2022-11-11 21:19:50 -0800 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2022-11-11 21:19:51 -0800 |
| commit | 4a432e068ce6bc59e18ab4d576e4dc5abaca42b4 (patch) | |
| tree | 6abb8ea589b1e891c4f592c5368dd49850b8bc1c /net/mptcp/pm_userspace.c | |
| parent | f4c4ca70dedc1bce8e7b1648e652aa9be1d3fcd7 (diff) | |
| parent | 4373bf4b72f93af9d045450a44d294953c590e2d (diff) | |
| download | linux-4a432e068ce6bc59e18ab4d576e4dc5abaca42b4.tar.gz linux-4a432e068ce6bc59e18ab4d576e4dc5abaca42b4.tar.bz2 linux-4a432e068ce6bc59e18ab4d576e4dc5abaca42b4.zip | |
Merge branch 'mptcp-miscellaneous-refactoring-and-small-fixes'
Mat Martineau says:
====================
mptcp: Miscellaneous refactoring and small fixes
Patches 1-3 do some refactoring to more consistently handle sock casts,
and to remove some duplicate code. No functional changes.
Patch 4 corrects a variable name in a self test, but does not change
functionality since the same value gets used due to bash's
scoping rules.
Patch 5 rewords a comment.
====================
Link: https://lore.kernel.org/r/20221110232322.125068-1-mathew.j.martineau@linux.intel.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/mptcp/pm_userspace.c')
| -rw-r--r-- | net/mptcp/pm_userspace.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c index 9e82250cbb70..5cb65f0928f4 100644 --- a/net/mptcp/pm_userspace.c +++ b/net/mptcp/pm_userspace.c @@ -291,7 +291,7 @@ int mptcp_nl_cmd_sf_create(struct sk_buff *skb, struct genl_info *info) goto create_err; } - sk = &msk->sk.icsk_inet.sk; + sk = (struct sock *)msk; lock_sock(sk); err = __mptcp_subflow_connect(sk, &addr_l, &addr_r); @@ -403,7 +403,7 @@ int mptcp_nl_cmd_sf_destroy(struct sk_buff *skb, struct genl_info *info) goto destroy_err; } - sk = &msk->sk.icsk_inet.sk; + sk = (struct sock *)msk; lock_sock(sk); ssk = mptcp_nl_find_ssk(msk, &addr_l, &addr_r); if (ssk) { |