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: (448 commits)
  [IPV4] nl_fib_lookup: Initialise res.r before fib_res_put(&res)
  [IPV6]: Fix thinko in ipv6_rthdr_rcv() changes.
  [IPV4]: Add multipath cached to feature-removal-schedule.txt
  [WIRELESS] cfg80211: Clarify locking comment.
  [WIRELESS] cfg80211: Fix locking in wiphy_new.
  [WEXT] net_device: Don't include wext bits if not required.
  [WEXT]: Misc code cleanups.
  [WEXT]: Reduce inline abuse.
  [WEXT]: Move EXPORT_SYMBOL statements where they belong.
  [WEXT]: Cleanup early ioctl call path.
  [WEXT]: Remove options.
  [WEXT]: Remove dead debug code.
  [WEXT]: Clean up how wext is called.
  [WEXT]: Move to net/wireless
  [AFS]: Eliminate cmpxchg() usage in vlocation code.
  [RXRPC]: Fix pointers passed to bitops.
  [RXRPC]: Remove bogus atomic_* overrides.
  [AFS]: Fix u64 printing in debug logging.
  [AFS]: Add "directory write" support.
  [AFS]: Implement the CB.InitCallBackState3 operation.
  ...

1 files changed, 47 insertions, 89 deletions

diff --git a/net/irda/af_irda.c b/net/irda/af_irda.c
index 0eb7d596d470..06c97c60d542 100644
--- a/net/irda/af_irda.c
+++ b/net/irda/af_irda.c
@@ -89,7 +89,6 @@ static int irda_data_indication(void *instance, void *sap, struct sk_buff *skb)
 
         self = instance;
         sk = instance;
-        IRDA_ASSERT(sk != NULL, return -1;);
 
         err = sock_queue_rcv_skb(sk, skb);
         if (err) {
@@ -131,14 +130,12 @@ static void irda_disconnect_indication(void *instance, void *sap,
         }
 
         /* Prevent race conditions with irda_release() and irda_shutdown() */
+        bh_lock_sock(sk);
         if (!sock_flag(sk, SOCK_DEAD) && sk->sk_state != TCP_CLOSE) {
-                lock_sock(sk);
                 sk->sk_state     = TCP_CLOSE;
-                sk->sk_err       = ECONNRESET;
                 sk->sk_shutdown |= SEND_SHUTDOWN;
 
                 sk->sk_state_change(sk);
-                release_sock(sk);
 
                 /* Close our TSAP.
                  * If we leave it open, IrLMP put it back into the list of
@@ -158,6 +155,7 @@ static void irda_disconnect_indication(void *instance, void *sap,
                         self->tsap = NULL;
                 }
         }
+        bh_unlock_sock(sk);
 
         /* Note : once we are there, there is not much you want to do
          * with the socket anymore, apart from closing it.
@@ -220,7 +218,7 @@ static void irda_connect_confirm(void *instance, void *sap,
                 break;
         default:
                 self->max_data_size = irttp_get_max_seg_size(self->tsap);
-        };
+        }
 
         IRDA_DEBUG(2, "%s(), max_data_size=%d\n", __FUNCTION__,
                    self->max_data_size);
@@ -283,7 +281,7 @@ static void irda_connect_indication(void *instance, void *sap,
                 break;
         default:
                 self->max_data_size = irttp_get_max_seg_size(self->tsap);
-        };
+        }
 
         IRDA_DEBUG(2, "%s(), max_data_size=%d\n", __FUNCTION__,
                    self->max_data_size);
@@ -306,8 +304,6 @@ static void irda_connect_response(struct irda_sock *self)
 
         IRDA_DEBUG(2, "%s()\n", __FUNCTION__);
 
-        IRDA_ASSERT(self != NULL, return;);
-
         skb = alloc_skb(TTP_MAX_HEADER + TTP_SAR_HEADER,
                         GFP_ATOMIC);
         if (skb == NULL) {
@@ -337,7 +333,7 @@ static void irda_flow_indication(void *instance, void *sap, LOCAL_FLOW flow)
 
         self = instance;
         sk = instance;
-        IRDA_ASSERT(sk != NULL, return;);
+        BUG_ON(sk == NULL);
 
         switch (flow) {
         case FLOW_STOP:
@@ -449,7 +445,7 @@ static void irda_discovery_timeout(u_long priv)
         IRDA_DEBUG(2, "%s()\n", __FUNCTION__);
 
         self = (struct irda_sock *) priv;
-        IRDA_ASSERT(self != NULL, return;);
+        BUG_ON(self == NULL);
 
         /* Nothing for the caller */
         self->cachelog = NULL;
@@ -546,8 +542,6 @@ static int irda_find_lsap_sel(struct irda_sock *self, char *name)
 {
         IRDA_DEBUG(2, "%s(%p, %s)\n", __FUNCTION__, self, name);
 
-        IRDA_ASSERT(self != NULL, return -1;);
-
         if (self->iriap) {
                 IRDA_WARNING("%s(): busy with a previous query\n",
                              __FUNCTION__);
@@ -635,8 +629,6 @@ static int irda_discover_daddr_and_lsap_sel(struct irda_sock *self, char *name)
 
         IRDA_DEBUG(2, "%s(), name=%s\n", __FUNCTION__, name);
 
-        IRDA_ASSERT(self != NULL, return -1;);
-
         /* Ask lmp for the current discovery log
          * Note : we have to use irlmp_get_discoveries(), as opposed
          * to play with the cachelog directly, because while we are
@@ -784,8 +776,6 @@ static int irda_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
         struct irda_sock *self = irda_sk(sk);
         int err;
 
-        IRDA_ASSERT(self != NULL, return -1;);
-
         IRDA_DEBUG(2, "%s(%p)\n", __FUNCTION__, self);
 
         if (addr_len != sizeof(struct sockaddr_irda))
@@ -841,8 +831,6 @@ static int irda_accept(struct socket *sock, struct socket *newsock, int flags)
 
         IRDA_DEBUG(2, "%s()\n", __FUNCTION__);
 
-        IRDA_ASSERT(self != NULL, return -1;);
-
         err = irda_create(newsock, sk->sk_protocol);
         if (err)
                 return err;
@@ -873,44 +861,28 @@ static int irda_accept(struct socket *sock, struct socket *newsock, int flags)
          * calling us, the data is waiting for us ;-)
          * Jean II
          */
-        skb = skb_dequeue(&sk->sk_receive_queue);
-        if (skb == NULL) {
-                int ret = 0;
-                DECLARE_WAITQUEUE(waitq, current);
+        while (1) {
+                skb = skb_dequeue(&sk->sk_receive_queue);
+                if (skb)
+                        break;
 
                 /* Non blocking operation */
                 if (flags & O_NONBLOCK)
                         return -EWOULDBLOCK;
 
-                /* The following code is a cut'n'paste of the
-                 * wait_event_interruptible() macro.
-                 * We don't us the macro because the condition has
-                 * side effects : we want to make sure that only one
-                 * skb get dequeued - Jean II */
-                add_wait_queue(sk->sk_sleep, &waitq);
-                for (;;) {
-                        set_current_state(TASK_INTERRUPTIBLE);
-                        skb = skb_dequeue(&sk->sk_receive_queue);
-                        if (skb != NULL)
-                                break;
-                        if (!signal_pending(current)) {
-                                schedule();
-                                continue;
-                        }
-                        ret = -ERESTARTSYS;
-                        break;
-                }
-                current->state = TASK_RUNNING;
-                remove_wait_queue(sk->sk_sleep, &waitq);
-                if(ret)
-                        return -ERESTARTSYS;
+                err = wait_event_interruptible(*(sk->sk_sleep),
+                                        skb_peek(&sk->sk_receive_queue));
+                if (err)
+                        return err;
         }
 
         newsk = newsock->sk;
+        if (newsk == NULL)
+                return -EIO;
+
         newsk->sk_state = TCP_ESTABLISHED;
 
         new = irda_sk(newsk);
-        IRDA_ASSERT(new != NULL, return -1;);
 
         /* Now attach up the new socket */
         new->tsap = irttp_dup(self->tsap, new);
@@ -1061,7 +1033,8 @@ static int irda_connect(struct socket *sock, struct sockaddr *uaddr,
 
         if (sk->sk_state != TCP_ESTABLISHED) {
                 sock->state = SS_UNCONNECTED;
-                return sock_error(sk);  /* Always set at this point */
+                err = sock_error(sk);
+                return err? err : -ECONNRESET;
         }
 
         sock->state = SS_CONNECTED;
@@ -1171,8 +1144,6 @@ static void irda_destroy_socket(struct irda_sock *self)
 {
         IRDA_DEBUG(2, "%s(%p)\n", __FUNCTION__, self);
 
-        IRDA_ASSERT(self != NULL, return;);
-
         /* Unregister with IrLMP */
         irlmp_unregister_client(self->ckey);
         irlmp_unregister_service(self->skey);
@@ -1274,7 +1245,6 @@ static int irda_sendmsg(struct kiocb *iocb, struct socket *sock,
         struct sock *sk = sock->sk;
         struct irda_sock *self;
         struct sk_buff *skb;
-        unsigned char *asmptr;
         int err;
 
         IRDA_DEBUG(4, "%s(), len=%zd\n", __FUNCTION__, len);
@@ -1292,7 +1262,6 @@ static int irda_sendmsg(struct kiocb *iocb, struct socket *sock,
                 return -ENOTCONN;
 
         self = irda_sk(sk);
-        IRDA_ASSERT(self != NULL, return -1;);
 
         /* Check if IrTTP is wants us to slow down */
 
@@ -1317,9 +1286,9 @@ static int irda_sendmsg(struct kiocb *iocb, struct socket *sock,
                 return -ENOBUFS;
 
         skb_reserve(skb, self->max_header_size + 16);
-
-        asmptr = skb->h.raw = skb_put(skb, len);
-        err = memcpy_fromiovec(asmptr, msg->msg_iov, len);
+        skb_reset_transport_header(skb);
+        skb_put(skb, len);
+        err = memcpy_fromiovec(skb_transport_header(skb), msg->msg_iov, len);
         if (err) {
                 kfree_skb(skb);
                 return err;
@@ -1355,16 +1324,16 @@ static int irda_recvmsg_dgram(struct kiocb *iocb, struct socket *sock,
 
         IRDA_DEBUG(4, "%s()\n", __FUNCTION__);
 
-        IRDA_ASSERT(self != NULL, return -1;);
-        IRDA_ASSERT(!sock_error(sk), return -1;);
+        if ((err = sock_error(sk)) < 0)
+                return err;
 
         skb = skb_recv_datagram(sk, flags & ~MSG_DONTWAIT,
                                 flags & MSG_DONTWAIT, &err);
         if (!skb)
                 return err;
 
-        skb->h.raw = skb->data;
-        copied     = skb->len;
+        skb_reset_transport_header(skb);
+        copied = skb->len;
 
         if (copied > size) {
                 IRDA_DEBUG(2, "%s(), Received truncated frame (%zd < %zd)!\n",
@@ -1403,13 +1372,13 @@ static int irda_recvmsg_stream(struct kiocb *iocb, struct socket *sock,
         struct irda_sock *self = irda_sk(sk);
         int noblock = flags & MSG_DONTWAIT;
         size_t copied = 0;
-        int target = 1;
-        DECLARE_WAITQUEUE(waitq, current);
+        int target, err;
+        long timeo;
 
         IRDA_DEBUG(3, "%s()\n", __FUNCTION__);
 
-        IRDA_ASSERT(self != NULL, return -1;);
-        IRDA_ASSERT(!sock_error(sk), return -1;);
+        if ((err = sock_error(sk)) < 0)
+                return err;
 
         if (sock->flags & __SO_ACCEPTCON)
                 return(-EINVAL);
@@ -1417,8 +1386,8 @@ static int irda_recvmsg_stream(struct kiocb *iocb, struct socket *sock,
         if (flags & MSG_OOB)
                 return -EOPNOTSUPP;
 
-        if (flags & MSG_WAITALL)
-                target = size;
+        target = sock_rcvlowat(sk, flags & MSG_WAITALL, size);
+        timeo = sock_rcvtimeo(sk, noblock);
 
         msg->msg_namelen = 0;
 
@@ -1426,19 +1395,14 @@ static int irda_recvmsg_stream(struct kiocb *iocb, struct socket *sock,
                 int chunk;
                 struct sk_buff *skb = skb_dequeue(&sk->sk_receive_queue);
 
-                if (skb==NULL) {
+                if (skb == NULL) {
+                        DEFINE_WAIT(wait);
                         int ret = 0;
 
                         if (copied >= target)
                                 break;
 
-                        /* The following code is a cut'n'paste of the
-                         * wait_event_interruptible() macro.
-                         * We don't us the macro because the test condition
-                         * is messy. - Jean II */
-                        set_bit(SOCK_ASYNC_WAITDATA, &sk->sk_socket->flags);
-                        add_wait_queue(sk->sk_sleep, &waitq);
-                        set_current_state(TASK_INTERRUPTIBLE);
+                        prepare_to_wait_exclusive(sk->sk_sleep, &wait, TASK_INTERRUPTIBLE);
 
                         /*
                          *      POSIX 1003.1g mandates this order.
@@ -1451,17 +1415,17 @@ static int irda_recvmsg_stream(struct kiocb *iocb, struct socket *sock,
                         else if (noblock)
                                 ret = -EAGAIN;
                         else if (signal_pending(current))
-                                ret = -ERESTARTSYS;
+                                ret = sock_intr_errno(timeo);
+                        else if (sk->sk_state != TCP_ESTABLISHED)
+                                ret = -ENOTCONN;
                         else if (skb_peek(&sk->sk_receive_queue) == NULL)
                                 /* Wait process until data arrives */
                                 schedule();
 
-                        current->state = TASK_RUNNING;
-                        remove_wait_queue(sk->sk_sleep, &waitq);
-                        clear_bit(SOCK_ASYNC_WAITDATA, &sk->sk_socket->flags);
+                        finish_wait(sk->sk_sleep, &wait);
 
-                        if(ret)
-                                return(ret);
+                        if (ret)
+                                return ret;
                         if (sk->sk_shutdown & RCV_SHUTDOWN)
                                 break;
 
@@ -1530,7 +1494,6 @@ static int irda_sendmsg_dgram(struct kiocb *iocb, struct socket *sock,
         struct sock *sk = sock->sk;
         struct irda_sock *self;
         struct sk_buff *skb;
-        unsigned char *asmptr;
         int err;
 
         IRDA_DEBUG(4, "%s(), len=%zd\n", __FUNCTION__, len);
@@ -1547,7 +1510,6 @@ static int irda_sendmsg_dgram(struct kiocb *iocb, struct socket *sock,
                 return -ENOTCONN;
 
         self = irda_sk(sk);
-        IRDA_ASSERT(self != NULL, return -1;);
 
         /*
          * Check that we don't send out too big frames. This is an unreliable
@@ -1566,10 +1528,11 @@ static int irda_sendmsg_dgram(struct kiocb *iocb, struct socket *sock,
                 return -ENOBUFS;
 
         skb_reserve(skb, self->max_header_size);
+        skb_reset_transport_header(skb);
 
         IRDA_DEBUG(4, "%s(), appending user data\n", __FUNCTION__);
-        asmptr = skb->h.raw = skb_put(skb, len);
-        err = memcpy_fromiovec(asmptr, msg->msg_iov, len);
+        skb_put(skb, len);
+        err = memcpy_fromiovec(skb_transport_header(skb), msg->msg_iov, len);
         if (err) {
                 kfree_skb(skb);
                 return err;
@@ -1602,7 +1565,6 @@ static int irda_sendmsg_ultra(struct kiocb *iocb, struct socket *sock,
         __u8 pid = 0;
         int bound = 0;
         struct sk_buff *skb;
-        unsigned char *asmptr;
         int err;
 
         IRDA_DEBUG(4, "%s(), len=%zd\n", __FUNCTION__, len);
@@ -1616,7 +1578,6 @@ static int irda_sendmsg_ultra(struct kiocb *iocb, struct socket *sock,
         }
 
         self = irda_sk(sk);
-        IRDA_ASSERT(self != NULL, return -1;);
 
         /* Check if an address was specified with sendto. Jean II */
         if (msg->msg_name) {
@@ -1662,10 +1623,11 @@ static int irda_sendmsg_ultra(struct kiocb *iocb, struct socket *sock,
                 return -ENOBUFS;
 
         skb_reserve(skb, self->max_header_size);
+        skb_reset_transport_header(skb);
 
         IRDA_DEBUG(4, "%s(), appending user data\n", __FUNCTION__);
-        asmptr = skb->h.raw = skb_put(skb, len);
-        err = memcpy_fromiovec(asmptr, msg->msg_iov, len);
+        skb_put(skb, len);
+        err = memcpy_fromiovec(skb_transport_header(skb), msg->msg_iov, len);
         if (err) {
                 kfree_skb(skb);
                 return err;
@@ -1689,8 +1651,6 @@ static int irda_shutdown(struct socket *sock, int how)
         struct sock *sk = sock->sk;
         struct irda_sock *self = irda_sk(sk);
 
-        IRDA_ASSERT(self != NULL, return -1;);
-
         IRDA_DEBUG(1, "%s(%p)\n", __FUNCTION__, self);
 
         sk->sk_state       = TCP_CLOSE;
@@ -1863,8 +1823,6 @@ static int irda_setsockopt(struct socket *sock, int level, int optname,
         struct ias_attrib *     ias_attr;       /* Attribute in IAS object */
         int opt;
 
-        IRDA_ASSERT(self != NULL, return -1;);
-
         IRDA_DEBUG(2, "%s(%p)\n", __FUNCTION__, self);
 
         if (level != SOL_IRLMP)