diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-25 19:28:56 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-25 19:28:56 -0400 |
| commit | b91ce4d14a21fc04d165be30319541e0f9204f15 (patch) | |
| tree | 777a0e110de0d378c9425684369bef9cbab20649 /net | |
| parent | 202f2bb0708e968099a23fead4598a4c3f8f8637 (diff) | |
| parent | 6443bb1fc2050ca2b6585a3fa77f7833b55329ed (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
ipv6: Fix inet6_csk_bind_conflict()
e100: Fix the TX workqueue race
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv6/inet6_connection_sock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/inet6_connection_sock.c b/net/ipv6/inet6_connection_sock.c index b4b7d40a9c95..3a4d92b5a83e 100644 --- a/net/ipv6/inet6_connection_sock.c +++ b/net/ipv6/inet6_connection_sock.c | |||
| @@ -48,7 +48,7 @@ int inet6_csk_bind_conflict(const struct sock *sk, | |||
| 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 && | 50 | else if (sk->sk_reuse && sk2->sk_reuse && |
| 51 | !ipv6_addr_any(inet6_rcv_saddr(sk2)) && | 51 | !ipv6_addr_any(inet6_rcv_saddr(sk)) && |
| 52 | ipv6_rcv_saddr_equal(sk, sk2)) | 52 | ipv6_rcv_saddr_equal(sk, sk2)) |
| 53 | break; | 53 | break; |
| 54 | } | 54 | } |