diff options
| author | Takashi Iwai <[email protected]> | 2017-11-01 16:43:20 +0000 |
|---|---|---|
| committer | Takashi Iwai <[email protected]> | 2017-11-01 16:43:20 +0000 |
| commit | a53a0ab8ff725672fcb47bb9a5ef75fce45679d0 (patch) | |
| tree | 75cdea78f27fdd569d72cea0b7837bbcc8d871f7 /net/ipv4/inet_hashtables.c | |
| parent | ALSA: seq: Fix nested rwsem annotation for lockdep splat (diff) | |
| parent | Merge remote-tracking branches 'asoc/fix/topology', 'asoc/fix/adau17x1', 'aso... (diff) | |
| download | kernel-a53a0ab8ff725672fcb47bb9a5ef75fce45679d0.tar.gz kernel-a53a0ab8ff725672fcb47bb9a5ef75fce45679d0.zip | |
Merge tag 'asoc-fix-v4.14-rc7' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v4.14
A bunch of fixes here, mostly device specific ones (the biggest one
being the revert of the hotword support for rt5514), with a couple of
core fixes for potential issues with corrupted or otherwise invalid
topology files.
Diffstat (limited to 'net/ipv4/inet_hashtables.c')
| -rw-r--r-- | net/ipv4/inet_hashtables.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c index 597bb4cfe805..e7d15fb0d94d 100644 --- a/net/ipv4/inet_hashtables.c +++ b/net/ipv4/inet_hashtables.c @@ -456,10 +456,7 @@ static int inet_reuseport_add_sock(struct sock *sk, return reuseport_add_sock(sk, sk2); } - /* Initial allocation may have already happened via setsockopt */ - if (!rcu_access_pointer(sk->sk_reuseport_cb)) - return reuseport_alloc(sk); - return 0; + return reuseport_alloc(sk); } int __inet_hash(struct sock *sk, struct sock *osk) |