diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2021-09-30 14:49:21 -0700 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2021-09-30 14:49:21 -0700 |
| commit | dd9a887b35b01d7027f974f5e7936f1410ab51ca (patch) | |
| tree | 4a827b3e88fd896de1408c26ebebc2535b14750a /net/mptcp/mptcp_diag.c | |
| parent | b05173028cc52384be42dcf81abdb4133caccfa5 (diff) | |
| parent | 4de593fb965fc2bd11a0b767e0c65ff43540a6e4 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
drivers/net/phy/bcm7xxx.c
d88fd1b546ff ("net: phy: bcm7xxx: Fixed indirect MMD operations")
f68d08c437f9 ("net: phy: bcm7xxx: Add EPHY entry for 72165")
net/sched/sch_api.c
b193e15ac69d ("net: prevent user from passing illegal stab size")
69508d43334e ("net_sched: Use struct_size() and flex_array_size() helpers")
Both cases trivial - adjacent code additions.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/mptcp/mptcp_diag.c')
| -rw-r--r-- | net/mptcp/mptcp_diag.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mptcp/mptcp_diag.c b/net/mptcp/mptcp_diag.c index fdf0c1f15a65..f44125dd6697 100644 --- a/net/mptcp/mptcp_diag.c +++ b/net/mptcp/mptcp_diag.c @@ -36,7 +36,7 @@ static int mptcp_diag_dump_one(struct netlink_callback *cb, struct sock *sk; net = sock_net(in_skb->sk); - msk = mptcp_token_get_sock(req->id.idiag_cookie[0]); + msk = mptcp_token_get_sock(net, req->id.idiag_cookie[0]); if (!msk) goto out_nosk; |