diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2021-10-01 00:49:21 +0300 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2021-10-01 00:49:21 +0300 |
| commit | dd9a887b35b01d7027f974f5e7936f1410ab51ca (patch) | |
| tree | 4a827b3e88fd896de1408c26ebebc2535b14750a /net/mptcp/protocol.c | |
| parent | b05173028cc52384be42dcf81abdb4133caccfa5 (diff) | |
| parent | 4de593fb965fc2bd11a0b767e0c65ff43540a6e4 (diff) | |
| download | linux-dd9a887b35b01d7027f974f5e7936f1410ab51ca.tar.xz | |
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/protocol.c')
| -rw-r--r-- | net/mptcp/protocol.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 8029bbbe1c9e..fda47011b19c 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -2779,7 +2779,7 @@ cleanup: inet_csk(sk)->icsk_mtup.probe_timestamp = tcp_jiffies32; mptcp_for_each_subflow(mptcp_sk(sk), subflow) { struct sock *ssk = mptcp_subflow_tcp_sock(subflow); - bool slow = lock_sock_fast(ssk); + bool slow = lock_sock_fast_nested(ssk); sock_orphan(ssk); unlock_sock_fast(ssk, slow); |