1 files changed, 11 insertions, 3 deletions

diff --git a/drivers/infiniband/hw/qib/qib_uc.c b/drivers/infiniband/hw/qib/qib_uc.c
index 32ccf3c824ca..d31f33a99887 100644
--- a/drivers/infiniband/hw/qib/qib_uc.c
+++ b/drivers/infiniband/hw/qib/qib_uc.c
@@ -270,7 +270,6 @@ void qib_uc_rcv(struct qib_ibport *ibp, struct qib_ib_header *hdr,
 
         psn = be32_to_cpu(ohdr->bth[2]);
         opcode >>= 24;
-        memset(&wc, 0, sizeof wc);
 
         /* Compare the PSN verses the expected PSN. */
         if (unlikely(qib_cmp24(psn, qp->r_psn) != 0)) {
@@ -370,7 +369,7 @@ send_first:
                 }
                 qp->r_rcv_len = 0;
                 if (opcode == OP(SEND_ONLY))
-                        goto send_last;
+                        goto no_immediate_data;
                 else if (opcode == OP(SEND_ONLY_WITH_IMMEDIATE))
                         goto send_last_imm;
                 /* FALLTHROUGH */
@@ -389,8 +388,11 @@ send_last_imm:
                 wc.ex.imm_data = ohdr->u.imm_data;
                 hdrsize += 4;
                 wc.wc_flags = IB_WC_WITH_IMM;
-                /* FALLTHROUGH */
+                goto send_last;
         case OP(SEND_LAST):
+no_immediate_data:
+                wc.ex.imm_data = 0;
+                wc.wc_flags = 0;
 send_last:
                 /* Get the number of bytes the message was padded by. */
                 pad = (be32_to_cpu(ohdr->bth[0]) >> 20) & 3;
@@ -418,6 +420,12 @@ last_imm:
                 wc.src_qp = qp->remote_qpn;
                 wc.slid = qp->remote_ah_attr.dlid;
                 wc.sl = qp->remote_ah_attr.sl;
+                /* zero fields that are N/A */
+                wc.vendor_err = 0;
+                wc.pkey_index = 0;
+                wc.dlid_path_bits = 0;
+                wc.port_num = 0;
+                wc.csum_ok = 0;
                 /* Signal completion event if the solicited bit is set. */
                 qib_cq_enter(to_icq(qp->ibqp.recv_cq), &wc,
                              (ohdr->bth[0] &