diff options
| author | David S. Miller <davem@davemloft.net> | 2010-05-02 21:43:40 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-05-02 22:02:06 -0700 |
| commit | 7ef527377b88ff05fb122a47619ea506c631c914 (patch) | |
| tree | 2c2e774527d5f591b975834f43e8c6fd12fb38f2 /net/ipv6 | |
| parent | 47d29646a2c1c147d8a7598aeac2c87dd71ed638 (diff) | |
| parent | 1183f3838c588545592c042c0ce15015661ce7f2 (diff) | |
| download | op-kernel-dev-7ef527377b88ff05fb122a47619ea506c631c914.zip op-kernel-dev-7ef527377b88ff05fb122a47619ea506c631c914.tar.gz | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/ipv6')
| -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 9ca1efc..0c5e3c3 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, if (sk != sk2 && (!sk->sk_bound_dev_if || !sk2->sk_bound_dev_if || - sk->sk_bound_dev_if == sk2->sk_bound_dev_if)) { - if ((!sk->sk_reuse || !sk2->sk_reuse || - sk2->sk_state == TCP_LISTEN) && - ipv6_rcv_saddr_equal(sk, sk2)) - break; - else if (sk->sk_reuse && sk2->sk_reuse && - !ipv6_addr_any(inet6_rcv_saddr(sk)) && - ipv6_rcv_saddr_equal(sk, sk2)) - break; - } + sk->sk_bound_dev_if == sk2->sk_bound_dev_if) && + (!sk->sk_reuse || !sk2->sk_reuse || + sk2->sk_state == TCP_LISTEN) && + ipv6_rcv_saddr_equal(sk, sk2)) + break; } return node != NULL; |
