diff options
| author | David S. Miller <davem@davemloft.net> | 2012-02-04 16:39:32 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-02-04 16:39:32 -0500 |
| commit | dd48dc34fe7639a8b2e22d8b609672f5f81aa7cb (patch) | |
| tree | f16ace0ae09edab16bf6d0be9e8280dfbb7100da /net/ipv4/inet_connection_sock.c | |
| parent | 8d9eb069eafce49307f839783e4a4673414b1fd5 (diff) | |
| parent | 5962b35c1de3254a2f03b95efd3b7854b874d7b7 (diff) | |
| download | op-kernel-dev-dd48dc34fe7639a8b2e22d8b609672f5f81aa7cb.zip op-kernel-dev-dd48dc34fe7639a8b2e22d8b609672f5f81aa7cb.tar.gz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'net/ipv4/inet_connection_sock.c')
| -rw-r--r-- | net/ipv4/inet_connection_sock.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c index 2e4e244..19d66ce 100644 --- a/net/ipv4/inet_connection_sock.c +++ b/net/ipv4/inet_connection_sock.c @@ -123,11 +123,14 @@ again: smallest_size = tb->num_owners; smallest_rover = rover; if (atomic_read(&hashinfo->bsockets) > (high - low) + 1) { - spin_unlock(&head->lock); snum = smallest_rover; - goto have_snum; + goto tb_found; } } + if (!inet_csk(sk)->icsk_af_ops->bind_conflict(sk, tb)) { + snum = rover; + goto tb_found; + } goto next; } break; |
