Skip to content

Commit

Permalink
[NET]: Revert incorrect accept queue backlog changes.
Browse files Browse the repository at this point in the history
This reverts two changes:

8488df8
248f067

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: David S. Miller <davem@davemloft.net>
  • Loading branch information
David S. Miller committed Mar 6, 2007
1 parent 187f5f8 commit 64a1465
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion include/net/sock.h
Original file line number Diff line number Diff line change
Expand Up @@ -426,7 +426,7 @@ static inline void sk_acceptq_added(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;
}

/*
Expand Down
6 changes: 3 additions & 3 deletions net/unix/af_unix.c
Original file line number Diff line number Diff line change
Expand Up @@ -934,7 +934,7 @@ static long unix_wait_for_peer(struct sock *other, long timeo)

sched = !sock_flag(other, SOCK_DEAD) &&
!(other->sk_shutdown & RCV_SHUTDOWN) &&
(skb_queue_len(&other->sk_receive_queue) >=
(skb_queue_len(&other->sk_receive_queue) >
other->sk_max_ack_backlog);

unix_state_runlock(other);
Expand Down Expand Up @@ -1008,7 +1008,7 @@ static int unix_stream_connect(struct socket *sock, struct sockaddr *uaddr,
if (other->sk_state != TCP_LISTEN)
goto out_unlock;

if (skb_queue_len(&other->sk_receive_queue) >=
if (skb_queue_len(&other->sk_receive_queue) >
other->sk_max_ack_backlog) {
err = -EAGAIN;
if (!timeo)
Expand Down Expand Up @@ -1381,7 +1381,7 @@ static int unix_dgram_sendmsg(struct kiocb *kiocb, struct socket *sock,
}

if (unix_peer(other) != sk &&
(skb_queue_len(&other->sk_receive_queue) >=
(skb_queue_len(&other->sk_receive_queue) >
other->sk_max_ack_backlog)) {
if (!timeo) {
err = -EAGAIN;
Expand Down

0 comments on commit 64a1465

Please sign in to comment.