diff options
| author | Takashi Iwai <tiwai@suse.de> | 2016-04-27 17:30:49 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2016-04-27 17:30:49 +0200 |
| commit | af9cc93c0dee5fc1f9fa32cd9d79a456738a21be (patch) | |
| tree | 91aed45708ad9782de42560ecd25ea5f740dae9b /include/net/sock.h | |
| parent | bb03ed216370cb021f377f923471e56d1de3ff5d (diff) | |
| parent | 8c0f55100478649e3c0133684aa4aebab77ce10f (diff) | |
| download | linux-af9cc93c0dee5fc1f9fa32cd9d79a456738a21be.tar.bz2 | |
Merge tag 'asoc-fix-v4.6-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v4.6
This is a fairly large collection of fixes but almost all driver
specific ones, especially to the new Intel drivers which have had a lot
of recent development. The one core fix is a change to the debugfs code
to avoid crashes in some relatively unusual configurations.
Diffstat (limited to 'include/net/sock.h')
| -rw-r--r-- | include/net/sock.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/net/sock.h b/include/net/sock.h index 255d3e03727b..121ffc115c4f 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -630,7 +630,11 @@ static inline void sk_add_node_rcu(struct sock *sk, struct hlist_head *list) static inline void __sk_nulls_add_node_rcu(struct sock *sk, struct hlist_nulls_head *list) { - hlist_nulls_add_head_rcu(&sk->sk_nulls_node, list); + if (IS_ENABLED(CONFIG_IPV6) && sk->sk_reuseport && + sk->sk_family == AF_INET6) + hlist_nulls_add_tail_rcu(&sk->sk_nulls_node, list); + else + hlist_nulls_add_head_rcu(&sk->sk_nulls_node, list); } static inline void sk_nulls_add_node_rcu(struct sock *sk, struct hlist_nulls_head *list) |