Commit 64a14651 authored by David S. Miller's avatar David S. Miller
Browse files

[NET]: Revert incorrect accept queue backlog changes.

This reverts two changes:

8488df89
248f0672



A backlog value of N really does mean allow "N + 1" connections
to queue to a listening socket.  This allows one to specify
"0" as the backlog and still get 1 connection.

Noticed by Gerrit Renker and Rick Jones.
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 187f5f84
...@@ -426,7 +426,7 @@ static inline void sk_acceptq_added(struct sock *sk) ...@@ -426,7 +426,7 @@ static inline void sk_acceptq_added(struct sock *sk)
static inline int sk_acceptq_is_full(struct sock *sk) static inline int sk_acceptq_is_full(struct sock *sk)
{ {
return sk->sk_ack_backlog >= sk->sk_max_ack_backlog; return sk->sk_ack_backlog > sk->sk_max_ack_backlog;
} }
/* /*
......
...@@ -934,7 +934,7 @@ static long unix_wait_for_peer(struct sock *other, long timeo) ...@@ -934,7 +934,7 @@ static long unix_wait_for_peer(struct sock *other, long timeo)
sched = !sock_flag(other, SOCK_DEAD) && sched = !sock_flag(other, SOCK_DEAD) &&
!(other->sk_shutdown & RCV_SHUTDOWN) && !(other->sk_shutdown & RCV_SHUTDOWN) &&
(skb_queue_len(&other->sk_receive_queue) >= (skb_queue_len(&other->sk_receive_queue) >
other->sk_max_ack_backlog); other->sk_max_ack_backlog);
unix_state_runlock(other); unix_state_runlock(other);
...@@ -1008,7 +1008,7 @@ restart: ...@@ -1008,7 +1008,7 @@ restart:
if (other->sk_state != TCP_LISTEN) if (other->sk_state != TCP_LISTEN)
goto out_unlock; goto out_unlock;
if (skb_queue_len(&other->sk_receive_queue) >= if (skb_queue_len(&other->sk_receive_queue) >
other->sk_max_ack_backlog) { other->sk_max_ack_backlog) {
err = -EAGAIN; err = -EAGAIN;
if (!timeo) if (!timeo)
...@@ -1381,7 +1381,7 @@ restart: ...@@ -1381,7 +1381,7 @@ restart:
} }
if (unix_peer(other) != sk && if (unix_peer(other) != sk &&
(skb_queue_len(&other->sk_receive_queue) >= (skb_queue_len(&other->sk_receive_queue) >
other->sk_max_ack_backlog)) { other->sk_max_ack_backlog)) {
if (!timeo) { if (!timeo) {
err = -EAGAIN; err = -EAGAIN;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment