diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-11-30 12:03:38 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-11-30 12:03:38 +0800 |
| commit | 1184d6e8873282bcb4ba1d57da1cdd423a0f42d6 (patch) | |
| tree | 66bf3b45f218c738312d40e90c52f25069709892 /net/ipv4/inet_hashtables.c | |
| parent | 382ac60c32998318f133b8b84030aa83a8f600fe (diff) | |
| parent | 4e22accddef27103c4fba20b9613b7bf52129be6 (diff) | |
Merge remote-tracking branch 'rt-stable/v4.9-rt' into linux-linaro-lsk-v4.9-rtlsk-v4.9-17.11-rt
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 ca97835bfec4..b9bcf3db3af9 100644 --- a/net/ipv4/inet_hashtables.c +++ b/net/ipv4/inet_hashtables.c @@ -455,10 +455,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, |