Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
  [VLAN]: Avoid a 4-order allocation.
  [HDLC] Fix dev->header_cache_update having a random value.
  [NetLabel]: Verify sensitivity level has a valid CIPSO mapping
  [PPPOE]: Key connections properly on local device.
  [AF_UNIX]: Test against sk_max_ack_backlog properly.
  [NET]: Fix bugs in "Whether sock accept queue is full" checking

1 files changed, 3 insertions, 3 deletions

diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
index 606971645b33..51ca4383c388 100644
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@ -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);
@@ -1008,7 +1008,7 @@ restart:
         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)
@@ -1381,7 +1381,7 @@ restart:
         }
 
         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;