Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 3 insertions, 2 deletions

diff --git a/net/sunrpc/xprtrdma/verbs.c b/net/sunrpc/xprtrdma/verbs.c
index 465aafc2007f..27015c6d8eb5 100644
--- a/net/sunrpc/xprtrdma/verbs.c
+++ b/net/sunrpc/xprtrdma/verbs.c
@@ -48,6 +48,7 @@
  */
 
 #include <linux/pci.h>  /* for Tavor hack below */
+#include <linux/slab.h>
 
 #include "xprt_rdma.h"
 
@@ -878,8 +879,8 @@ if (strnicmp(ia->ri_id->device->dma_device->bus->name, "pci", 3) == 0) {
          * others indicate a transport condition which has already
          * undergone a best-effort.
          */
-        if (ep->rep_connected == -ECONNREFUSED
-            && ++retry_count <= RDMA_CONNECT_RETRY_MAX) {
+        if (ep->rep_connected == -ECONNREFUSED &&
+            ++retry_count <= RDMA_CONNECT_RETRY_MAX) {
                 dprintk("RPC:       %s: non-peer_reject, retry\n", __func__);
                 goto retry;
         }