diff options
| author | Craig Gallek <kraig@google.com> | 2016-04-25 10:42:12 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-04-25 13:27:54 -0400 |
| commit | d296ba60d8e2de23a350796a567a3aa90fe1cb6e (patch) | |
| tree | ab1bf652f5a708d2c553d1b4f308cede86cb4d90 /net | |
| parent | 5e91f6ce4c584d231763437a3ea3aded8e672363 (diff) | |
| download | op-kernel-dev-d296ba60d8e2de23a350796a567a3aa90fe1cb6e.zip op-kernel-dev-d296ba60d8e2de23a350796a567a3aa90fe1cb6e.tar.gz | |
soreuseport: Resolve merge conflict for v4/v6 ordering fix
d894ba18d4e4 ("soreuseport: fix ordering for mixed v4/v6 sockets")
was merged as a bug fix to the net tree. Two conflicting changes
were committed to net-next before the above fix was merged back to
net-next:
ca065d0cf80f ("udp: no longer use SLAB_DESTROY_BY_RCU")
3b24d854cb35 ("tcp/dccp: do not touch listener sk_refcnt under synflood")
These changes switched the datastructure used for TCP and UDP sockets
from hlist_nulls to hlist. This patch applies the necessary parts
of the net tree fix to net-next which were not automatic as part of the
merge.
Fixes: 1602f49b58ab ("Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net")
Signed-off-by: Craig Gallek <kraig@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv4/inet_hashtables.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c index fcadb67..b76b0d7 100644 --- a/net/ipv4/inet_hashtables.c +++ b/net/ipv4/inet_hashtables.c @@ -479,7 +479,11 @@ int __inet_hash(struct sock *sk, struct sock *osk, if (err) goto unlock; } - hlist_add_head_rcu(&sk->sk_node, &ilb->head); + if (IS_ENABLED(CONFIG_IPV6) && sk->sk_reuseport && + sk->sk_family == AF_INET6) + hlist_add_tail_rcu(&sk->sk_node, &ilb->head); + else + hlist_add_head_rcu(&sk->sk_node, &ilb->head); sock_set_flag(sk, SOCK_RCU_FREE); sock_prot_inuse_add(sock_net(sk), sk->sk_prot, 1); unlock: |
