3 files changed, 6 insertions, 6 deletions

diff --git a/drivers/staging/rdma/hfi1/chip.c b/drivers/staging/rdma/hfi1/chip.c
index 7799652773d5..263c88274514 100644
--- a/drivers/staging/rdma/hfi1/chip.c
+++ b/drivers/staging/rdma/hfi1/chip.c
@@ -9810,7 +9810,7 @@ static int goto_offline(struct hfi1_pportdata *ppd, u8 rem_reason)
 
         if (do_transition) {
                 ret = set_physical_link_state(dd,
-                                              PLS_OFFLINE | (rem_reason << 8));
+                                              (rem_reason << 8) | PLS_OFFLINE);
 
                 if (ret != HCMD_SUCCESS) {
                         dd_dev_err(dd,
@@ -14465,8 +14465,8 @@ static void handle_temp_err(struct hfi1_devdata *dd)
          */
         ppd->driver_link_ready = 0;
         ppd->link_enabled = 0;
-        set_physical_link_state(dd, PLS_OFFLINE |
-                                (OPA_LINKDOWN_REASON_SMA_DISABLED << 8));
+        set_physical_link_state(dd, (OPA_LINKDOWN_REASON_SMA_DISABLED << 8) |
+                                PLS_OFFLINE);
         /*
          * Step 2: Shutdown LCB and 8051
          *         After shutdown, do not restore DC_CFG_RESET value.
diff --git a/drivers/staging/rdma/hfi1/pio.c b/drivers/staging/rdma/hfi1/pio.c
index 361b43d47c76..e888e214356b 100644
--- a/drivers/staging/rdma/hfi1/pio.c
+++ b/drivers/staging/rdma/hfi1/pio.c
@@ -762,8 +762,8 @@ struct send_context *sc_alloc(struct hfi1_devdata *dd, int type,
 
         /* set the default partition key */
         write_kctxt_csr(dd, hw_context, SC(CHECK_PARTITION_KEY),
-                        (DEFAULT_PKEY &
-                         SC(CHECK_PARTITION_KEY_VALUE_MASK)) <<
+                        (SC(CHECK_PARTITION_KEY_VALUE_MASK) &
+                         DEFAULT_PKEY) <<
                         SC(CHECK_PARTITION_KEY_VALUE_SHIFT));
 
         /* per context type checks */
diff --git a/drivers/staging/rdma/hfi1/rc.c b/drivers/staging/rdma/hfi1/rc.c
index 1ce0e08378b4..351f136c7caa 100644
--- a/drivers/staging/rdma/hfi1/rc.c
+++ b/drivers/staging/rdma/hfi1/rc.c
@@ -2500,7 +2500,7 @@ send_last:
         return;
 
 rnr_nak:
-        qp->r_nak_state = IB_RNR_NAK | qp->r_min_rnr_timer;
+        qp->r_nak_state = qp->r_min_rnr_timer | IB_RNR_NAK;
         qp->r_ack_psn = qp->r_psn;
         /* Queue RNR NAK for later */
         rc_defered_ack(rcd, qp);