diff --git a/[refs] b/[refs] index 437c40b12975..c717aa0da2c4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ad0f9904444de1309dedd2b9e365cae8af77d9b1 +refs/heads/master: 5add300975cf36b1bd30c461105bb938da260f14 diff --git a/trunk/net/ipv4/inet_connection_sock.c b/trunk/net/ipv4/inet_connection_sock.c index df8e72f07478..9bc6a187bdce 100644 --- a/trunk/net/ipv4/inet_connection_sock.c +++ b/trunk/net/ipv4/inet_connection_sock.c @@ -172,7 +172,8 @@ int inet_csk_get_port(struct sock *sk, unsigned short snum) } else { ret = 1; if (inet_csk(sk)->icsk_af_ops->bind_conflict(sk, tb)) { - if (sk->sk_reuse && sk->sk_state != TCP_LISTEN && --attempts >= 0) { + if (sk->sk_reuse && sk->sk_state != TCP_LISTEN && + smallest_size != -1 && --attempts >= 0) { spin_unlock(&head->lock); goto again; }