sunrpc: fix warning in net/sunrpc/xprtrdma/svc_rdma_transport.c

[linux-2.6-omap-h63xx.git] / net / sunrpc / xprtrdma / svc_rdma_transport.c

diff --git a/net/sunrpc/xprtrdma/svc_rdma_transport.c b/net/sunrpc/xprtrdma/svc_rdma_transport.c
index c0cd334fe1c672de1fb288d4e2316c2d68eff19f..8872914aa4cfe7088fbcc86c62ee01d0f8f1128a 100644 (file)
--- a/net/sunrpc/xprtrdma/svc_rdma_transport.c
+++ b/net/sunrpc/xprtrdma/svc_rdma_transport.c
@@ -598,7 +598,7 @@ static int rdma_listen_handler(struct rdma_cm_id *cma_id,
                dprintk("svcrdma: Connect request on cma_id=%p, xprt = %p, "
                        "event=%d\n", cma_id, cma_id->context, event->event);
                handle_connect_req(cma_id,
-                                  event->param.conn.responder_resources);
+                                  event->param.conn.initiator_depth);
                break;
 
        case RDMA_CM_EVENT_ESTABLISHED:
@@ -827,7 +827,7 @@ static struct svc_xprt *svc_rdma_accept(struct svc_xprt *xprt)
        struct rdma_conn_param conn_param;
        struct ib_qp_init_attr qp_attr;
        struct ib_device_attr devattr;
-       int dma_mr_acc;
+       int uninitialized_var(dma_mr_acc);
        int need_dma_mr;
        int ret;
        int i;
@@ -1048,21 +1048,21 @@ static struct svc_xprt *svc_rdma_accept(struct svc_xprt *xprt)
 
        dprintk("svcrdma: new connection %p accepted with the following "
                "attributes:\n"
-               "    local_ip        : %d.%d.%d.%d\n"
+               "    local_ip        : %pI4\n"
                "    local_port      : %d\n"
-               "    remote_ip       : %d.%d.%d.%d\n"
+               "    remote_ip       : %pI4\n"
                "    remote_port     : %d\n"
                "    max_sge         : %d\n"
                "    sq_depth        : %d\n"
                "    max_requests    : %d\n"
                "    ord             : %d\n",
                newxprt,
-               NIPQUAD(((struct sockaddr_in *)&newxprt->sc_cm_id->
-                        route.addr.src_addr)->sin_addr.s_addr),
+               &((struct sockaddr_in *)&newxprt->sc_cm_id->
+                        route.addr.src_addr)->sin_addr.s_addr,
                ntohs(((struct sockaddr_in *)&newxprt->sc_cm_id->
                       route.addr.src_addr)->sin_port),
-               NIPQUAD(((struct sockaddr_in *)&newxprt->sc_cm_id->
-                        route.addr.dst_addr)->sin_addr.s_addr),
+               &((struct sockaddr_in *)&newxprt->sc_cm_id->
+                        route.addr.dst_addr)->sin_addr.s_addr,
                ntohs(((struct sockaddr_in *)&newxprt->sc_cm_id->
                       route.addr.dst_addr)->sin_port),
                newxprt->sc_max_sge,