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

5 files changed, 30 insertions, 28 deletions

diff --git a/net/9p/trans_fd.c b/net/9p/trans_fd.c
index 4e8d4e724b96..f624dff76852 100644
--- a/net/9p/trans_fd.c
+++ b/net/9p/trans_fd.c
@@ -1520,7 +1520,7 @@ static int __init p9_trans_fd_init(void)
         v9fs_register_trans(&p9_unix_trans);
         v9fs_register_trans(&p9_fd_trans);
 
-        return 1;
+        return 0;
 }
 
 module_init(p9_trans_fd_init);
diff --git a/net/core/sock.c b/net/core/sock.c
index 83e11f7260ff..f2ccb1620dc4 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -1642,7 +1642,7 @@ static void sock_def_readable(struct sock *sk, int len)
 {
         read_lock(&sk->sk_callback_lock);
         if (sk->sk_sleep && waitqueue_active(sk->sk_sleep))
-                wake_up_interruptible(sk->sk_sleep);
+                wake_up_interruptible_sync(sk->sk_sleep);
         sk_wake_async(sk, SOCK_WAKE_WAITD, POLL_IN);
         read_unlock(&sk->sk_callback_lock);
 }
@@ -1656,7 +1656,7 @@ static void sock_def_write_space(struct sock *sk)
          */
         if ((atomic_read(&sk->sk_wmem_alloc) << 1) <= sk->sk_sndbuf) {
                 if (sk->sk_sleep && waitqueue_active(sk->sk_sleep))
-                        wake_up_interruptible(sk->sk_sleep);
+                        wake_up_interruptible_sync(sk->sk_sleep);
 
                 /* Should agree with poll, otherwise some programs break */
                 if (sock_writeable(sk))
diff --git a/net/rxrpc/ar-internal.h b/net/rxrpc/ar-internal.h
index e58cc65728b5..c89b797b221d 100644
--- a/net/rxrpc/ar-internal.h
+++ b/net/rxrpc/ar-internal.h
@@ -23,7 +23,7 @@
 struct rxrpc_crypt {
         union {
                 u8      x[FCRYPT_BSIZE];
-                u32     n[2];
+                __be32  n[2];
         };
 } __attribute__((aligned(8)));
 
diff --git a/net/rxrpc/rxkad.c b/net/rxrpc/rxkad.c
index f48434adb7c2..d1c296f2d617 100644
--- a/net/rxrpc/rxkad.c
+++ b/net/rxrpc/rxkad.c
@@ -261,6 +261,7 @@ static int rxkad_secure_packet(const struct rxrpc_call *call,
                 __be32 x[2];
         } tmpbuf __attribute__((aligned(8))); /* must all be in same page */
         __be32 x;
+        u32 y;
         int ret;
 
         sp = rxrpc_skb(skb);
@@ -292,11 +293,11 @@ static int rxkad_secure_packet(const struct rxrpc_call *call,
         sg_init_one(&sg[1], &tmpbuf, sizeof(tmpbuf));
         crypto_blkcipher_encrypt_iv(&desc, &sg[0], &sg[1], sizeof(tmpbuf));
 
-        x = ntohl(tmpbuf.x[1]);
-        x = (x >> 16) & 0xffff;
-        if (x == 0)
-                x = 1; /* zero checksums are not permitted */
-        sp->hdr.cksum = htons(x);
+        y = ntohl(tmpbuf.x[1]);
+        y = (y >> 16) & 0xffff;
+        if (y == 0)
+                y = 1; /* zero checksums are not permitted */
+        sp->hdr.cksum = htons(y);
 
         switch (call->conn->security_level) {
         case RXRPC_SECURITY_PLAIN:
@@ -314,7 +315,7 @@ static int rxkad_secure_packet(const struct rxrpc_call *call,
                 break;
         }
 
-        _leave(" = %d [set %hx]", ret, x);
+        _leave(" = %d [set %hx]", ret, y);
         return ret;
 }
 
@@ -492,6 +493,7 @@ static int rxkad_verify_packet(const struct rxrpc_call *call,
                 __be32 x[2];
         } tmpbuf __attribute__((aligned(8))); /* must all be in same page */
         __be32 x;
+        u16 y;
         __be16 cksum;
         int ret;
 
@@ -526,12 +528,12 @@ static int rxkad_verify_packet(const struct rxrpc_call *call,
         sg_init_one(&sg[1], &tmpbuf, sizeof(tmpbuf));
         crypto_blkcipher_encrypt_iv(&desc, &sg[0], &sg[1], sizeof(tmpbuf));
 
-        x = ntohl(tmpbuf.x[1]);
-        x = (x >> 16) & 0xffff;
-        if (x == 0)
-                x = 1; /* zero checksums are not permitted */
+        y = ntohl(tmpbuf.x[1]);
+        y = (y >> 16) & 0xffff;
+        if (y == 0)
+                y = 1; /* zero checksums are not permitted */
 
-        cksum = htons(x);
+        cksum = htons(y);
         if (sp->hdr.cksum != cksum) {
                 *_abort_code = RXKADSEALEDINCON;
                 _leave(" = -EPROTO [csum failed]");
@@ -1001,7 +1003,8 @@ static int rxkad_verify_response(struct rxrpc_connection *conn,
         struct rxrpc_crypt session_key;
         time_t expiry;
         void *ticket;
-        u32 abort_code, version, kvno, ticket_len, csum, level;
+        u32 abort_code, version, kvno, ticket_len, level;
+        __be32 csum;
         int ret;
 
         _enter("{%d,%x}", conn->debug_id, key_serial(conn->server_key));
diff --git a/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c b/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
index ab54a736486e..c22d6b6f2db4 100644
--- a/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
+++ b/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
@@ -237,14 +237,12 @@ static void rdma_set_ctxt_sge(struct svc_rdma_op_ctxt *ctxt,
 
 static int rdma_read_max_sge(struct svcxprt_rdma *xprt, int sge_count)
 {
-#ifdef RDMA_TRANSPORT_IWARP
         if ((RDMA_TRANSPORT_IWARP ==
              rdma_node_get_transport(xprt->sc_cm_id->
                                      device->node_type))
             && sge_count > 1)
                 return 1;
         else
-#endif
                 return min_t(int, sge_count, xprt->sc_max_sge);
 }
 
@@ -324,15 +322,6 @@ next_sge:
                 ctxt->direction = DMA_FROM_DEVICE;
                 clear_bit(RDMACTXT_F_READ_DONE, &ctxt->flags);
                 clear_bit(RDMACTXT_F_LAST_CTXT, &ctxt->flags);
-                if ((ch+1)->rc_discrim == 0) {
-                        /*
-                         * Checked in sq_cq_reap to see if we need to
-                         * be enqueued
-                         */
-                        set_bit(RDMACTXT_F_LAST_CTXT, &ctxt->flags);
-                        ctxt->next = hdr_ctxt;
-                        hdr_ctxt->next = head;
-                }
 
                 /* Prepare READ WR */
                 memset(&read_wr, 0, sizeof read_wr);
@@ -350,7 +339,17 @@ next_sge:
                 rdma_set_ctxt_sge(ctxt, &sge[ch_sge_ary[ch_no].start],
                                   &sgl_offset,
                                   read_wr.num_sge);
-
+                if (((ch+1)->rc_discrim == 0) &&
+                    (read_wr.num_sge == ch_sge_ary[ch_no].count)) {
+                        /*
+                         * Mark the last RDMA_READ with a bit to
+                         * indicate all RPC data has been fetched from
+                         * the client and the RPC needs to be enqueued.
+                         */
+                        set_bit(RDMACTXT_F_LAST_CTXT, &ctxt->flags);
+                        ctxt->next = hdr_ctxt;
+                        hdr_ctxt->next = head;
+                }
                 /* Post the read */
                 err = svc_rdma_send(xprt, &read_wr);
                 if (err) {