diff options
Diffstat (limited to 'net/ipv6/inet6_connection_sock.c')
| -rw-r--r-- | net/ipv6/inet6_connection_sock.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/net/ipv6/inet6_connection_sock.c b/net/ipv6/inet6_connection_sock.c index 3a4d92b5a83e..628db24bcf22 100644 --- a/net/ipv6/inet6_connection_sock.c +++ b/net/ipv6/inet6_connection_sock.c | |||
| @@ -42,16 +42,11 @@ int inet6_csk_bind_conflict(const struct sock *sk, | |||
| 42 | if (sk != sk2 && | 42 | if (sk != sk2 && |
| 43 | (!sk->sk_bound_dev_if || | 43 | (!sk->sk_bound_dev_if || |
| 44 | !sk2->sk_bound_dev_if || | 44 | !sk2->sk_bound_dev_if || |
| 45 | sk->sk_bound_dev_if == sk2->sk_bound_dev_if)) { | 45 | sk->sk_bound_dev_if == sk2->sk_bound_dev_if) && |
| 46 | if ((!sk->sk_reuse || !sk2->sk_reuse || | 46 | (!sk->sk_reuse || !sk2->sk_reuse || |
| 47 | sk2->sk_state == TCP_LISTEN) && | 47 | sk2->sk_state == TCP_LISTEN) && |
| 48 | ipv6_rcv_saddr_equal(sk, sk2)) | 48 | ipv6_rcv_saddr_equal(sk, sk2)) |
| 49 | break; | 49 | break; |
| 50 | else if (sk->sk_reuse && sk2->sk_reuse && | ||
| 51 | !ipv6_addr_any(inet6_rcv_saddr(sk)) && | ||
| 52 | ipv6_rcv_saddr_equal(sk, sk2)) | ||
| 53 | break; | ||
| 54 | } | ||
| 55 | } | 50 | } |
| 56 | 51 | ||
| 57 | return node != NULL; | 52 | return node != NULL; |
