1 files changed, 6 insertions, 6 deletions

diff --git a/drivers/infiniband/ulp/ipoib/ipoib_ib.c b/drivers/infiniband/ulp/ipoib/ipoib_ib.c
index 192fef884e21..0a6f578f18c8 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_ib.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_ib.c
@@ -486,15 +486,16 @@ int ipoib_ib_dev_stop(struct net_device *dev)
 {
         struct ipoib_dev_priv *priv = netdev_priv(dev);
         struct ib_qp_attr qp_attr;
-        int attr_mask;
         unsigned long begin;
         struct ipoib_tx_buf *tx_req;
         int i;
 
-        /* Kill the existing QP and allocate a new one */
+        /*
+         * Move our QP to the error state and then reinitialize in
+         * when all work requests have completed or have been flushed.
+         */
         qp_attr.qp_state = IB_QPS_ERR;
-        attr_mask        = IB_QP_STATE;
-        if (ib_modify_qp(priv->qp, &qp_attr, attr_mask))
+        if (ib_modify_qp(priv->qp, &qp_attr, IB_QP_STATE))
                 ipoib_warn(priv, "Failed to modify QP to ERROR state\n");
 
         /* Wait for all sends and receives to complete */
@@ -541,8 +542,7 @@ int ipoib_ib_dev_stop(struct net_device *dev)
 
 timeout:
         qp_attr.qp_state = IB_QPS_RESET;
-        attr_mask        = IB_QP_STATE;
-        if (ib_modify_qp(priv->qp, &qp_attr, attr_mask))
+        if (ib_modify_qp(priv->qp, &qp_attr, IB_QP_STATE))
                 ipoib_warn(priv, "Failed to modify QP to RESET state\n");
 
         /* Wait for all AHs to be reaped */