diff options
| author | Takashi Iwai <tiwai@suse.de> | 2023-08-04 13:53:15 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2023-08-04 13:53:15 +0200 |
| commit | 4d84f763f7e137be7eeab30cc7daa9449c9cb053 (patch) | |
| tree | ad8869bf50680b5ee4876fbd8c7d6cd07df39f0d /net/mptcp/protocol.c | |
| parent | 788449ae57f4273111b779bbcaad552b67f517d5 (diff) | |
| parent | f803ec63686dec863a33cad87218d7d99c4b5e92 (diff) | |
Merge tag 'asoc-fix-v6.5-rc4' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fix for v6.5
Not really a fix, but rather a licensing update for the fsl_micfil
driver.
Diffstat (limited to 'net/mptcp/protocol.c')
| -rw-r--r-- | net/mptcp/protocol.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 3613489eb6e3..3317d1cca156 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -3723,10 +3723,9 @@ static int mptcp_listen(struct socket *sock, int backlog) if (!err) { sock_prot_inuse_add(sock_net(sk), sk->sk_prot, 1); mptcp_copy_inaddrs(sk, ssock->sk); + mptcp_event_pm_listener(ssock->sk, MPTCP_EVENT_LISTENER_CREATED); } - mptcp_event_pm_listener(ssock->sk, MPTCP_EVENT_LISTENER_CREATED); - unlock: release_sock(sk); return err; |