asus-laptop: notify ALL events

[linux-2.6-omap-h63xx.git] / net / unix / af_unix.c

diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
index 51ca4383c388da3a72ce3804de583fbafaa0ae2b..fc12ba51c1fc8223672c744e2c3eb06239741303 100644 (file)
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@ -111,7 +111,6 @@
 #include <net/scm.h>
 #include <linux/init.h>
 #include <linux/poll.h>
-#include <linux/smp_lock.h>
 #include <linux/rtnetlink.h>
 #include <linux/mount.h>
 #include <net/checksum.h>
@@ -934,7 +933,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 +1007,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)
@@ -1319,7 +1318,7 @@ static int unix_dgram_sendmsg(struct kiocb *kiocb, struct socket *sock,
                unix_attach_fds(siocb->scm, skb);
        unix_get_secdata(siocb->scm, skb);
 
-       skb->h.raw = skb->data;
+       skb_reset_transport_header(skb);
        err = memcpy_fromiovec(skb_put(skb,len), msg->msg_iov, len);
        if (err)
                goto out_free;
@@ -1381,7 +1380,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;