Merge tag 'for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford...

[cascardo/linux.git] / drivers / infiniband / sw / rxe / rxe_req.c

diff --git a/drivers/infiniband/sw/rxe/rxe_req.c b/drivers/infiniband/sw/rxe/rxe_req.c
index 13a848a..832846b 100644 (file)
--- a/drivers/infiniband/sw/rxe/rxe_req.c
+++ b/drivers/infiniband/sw/rxe/rxe_req.c
@@ -38,7 +38,7 @@
 #include "rxe_queue.h"
 
 static int next_opcode(struct rxe_qp *qp, struct rxe_send_wqe *wqe,
-                      unsigned opcode);
+                      u32 opcode);
 
 static inline void retry_first_write_send(struct rxe_qp *qp,
                                          struct rxe_send_wqe *wqe,
@@ -121,7 +121,7 @@ void rnr_nak_timer(unsigned long data)
 {
        struct rxe_qp *qp = (struct rxe_qp *)data;
 
-       pr_debug("rnr nak timer fired\n");
+       pr_debug("qp#%d rnr nak timer fired\n", qp_num(qp));
        rxe_run_task(&qp->req.task, 1);
 }
 
@@ -187,7 +187,7 @@ static struct rxe_send_wqe *req_next_wqe(struct rxe_qp *qp)
        return wqe;
 }
 
-static int next_opcode_rc(struct rxe_qp *qp, unsigned opcode, int fits)
+static int next_opcode_rc(struct rxe_qp *qp, u32 opcode, int fits)
 {
        switch (opcode) {
        case IB_WR_RDMA_WRITE:
@@ -259,7 +259,7 @@ static int next_opcode_rc(struct rxe_qp *qp, unsigned opcode, int fits)
        return -EINVAL;
 }
 
-static int next_opcode_uc(struct rxe_qp *qp, unsigned opcode, int fits)
+static int next_opcode_uc(struct rxe_qp *qp, u32 opcode, int fits)
 {
        switch (opcode) {
        case IB_WR_RDMA_WRITE:
@@ -311,7 +311,7 @@ static int next_opcode_uc(struct rxe_qp *qp, unsigned opcode, int fits)
 }
 
 static int next_opcode(struct rxe_qp *qp, struct rxe_send_wqe *wqe,
-                      unsigned opcode)
+                      u32 opcode)
 {
        int fits = (wqe->dma.resid <= qp->mtu);
 
@@ -588,7 +588,7 @@ int rxe_requester(void *arg)
        struct rxe_pkt_info pkt;
        struct sk_buff *skb;
        struct rxe_send_wqe *wqe;
-       unsigned mask;
+       enum rxe_hdr_mask mask;
        int payload;
        int mtu;
        int opcode;
@@ -626,7 +626,8 @@ next_wqe:
                        rmr = rxe_pool_get_index(&rxe->mr_pool,
                                                 wqe->wr.ex.invalidate_rkey >> 8);
                        if (!rmr) {
-                               pr_err("No mr for key %#x\n", wqe->wr.ex.invalidate_rkey);
+                               pr_err("No mr for key %#x\n",
+                                      wqe->wr.ex.invalidate_rkey);
                                wqe->state = wqe_state_error;
                                wqe->status = IB_WC_MW_BIND_ERR;
                                goto exit;
@@ -702,12 +703,12 @@ next_wqe:
 
        skb = init_req_packet(qp, wqe, opcode, payload, &pkt);
        if (unlikely(!skb)) {
-               pr_err("Failed allocating skb\n");
+               pr_err("qp#%d Failed allocating skb\n", qp_num(qp));
                goto err;
        }
 
        if (fill_packet(qp, wqe, &pkt, skb, payload)) {
-               pr_debug("Error during fill packet\n");
+               pr_debug("qp#%d Error during fill packet\n", qp_num(qp));
                goto err;
        }