3 files changed, 13 insertions, 11 deletions

diff --git a/drivers/infiniband/ulp/ipoib/ipoib_main.c b/drivers/infiniband/ulp/ipoib/ipoib_main.c
index 1e19b5ae7c4..ea0dfc77a7f 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_main.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_main.c
@@ -150,7 +150,7 @@ static int ipoib_stop(struct net_device *dev)
 
         netif_stop_queue(dev);
 
-        ipoib_ib_dev_down(dev, 0);
+        ipoib_ib_dev_down(dev, 1);
         ipoib_ib_dev_stop(dev, 0);
 
         if (!test_bit(IPOIB_FLAG_SUBINTERFACE, &priv->flags)) {
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
index 75367249f44..cecb98a4c66 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
@@ -175,7 +175,9 @@ static int ipoib_mcast_join_finish(struct ipoib_mcast *mcast,
 
         mcast->mcmember = *mcmember;
 
-        /* Set the cached Q_Key before we attach if it's the broadcast group */
+        /* Set the multicast MTU and cached Q_Key before we attach if it's
+         * the broadcast group.
+         */
         if (!memcmp(mcast->mcmember.mgid.raw, priv->dev->broadcast + 4,
                     sizeof (union ib_gid))) {
                 spin_lock_irq(&priv->lock);
@@ -183,10 +185,17 @@ static int ipoib_mcast_join_finish(struct ipoib_mcast *mcast,
                         spin_unlock_irq(&priv->lock);
                         return -EAGAIN;
                 }
+                priv->mcast_mtu = IPOIB_UD_MTU(ib_mtu_enum_to_int(priv->broadcast->mcmember.mtu));
                 priv->qkey = be32_to_cpu(priv->broadcast->mcmember.qkey);
                 spin_unlock_irq(&priv->lock);
                 priv->tx_wr.wr.ud.remote_qkey = priv->qkey;
                 set_qkey = 1;
+
+                if (!ipoib_cm_admin_enabled(dev)) {
+                        rtnl_lock();
+                        dev_set_mtu(dev, min(priv->mcast_mtu, priv->admin_mtu));
+                        rtnl_unlock();
+                }
         }
 
         if (!test_bit(IPOIB_MCAST_FLAG_SENDONLY, &mcast->flags)) {
@@ -574,14 +583,6 @@ void ipoib_mcast_join_task(struct work_struct *work)
                 return;
         }
 
-        priv->mcast_mtu = IPOIB_UD_MTU(ib_mtu_enum_to_int(priv->broadcast->mcmember.mtu));
-
-        if (!ipoib_cm_admin_enabled(dev)) {
-                rtnl_lock();
-                dev_set_mtu(dev, min(priv->mcast_mtu, priv->admin_mtu));
-                rtnl_unlock();
-        }
-
         ipoib_dbg_mcast(priv, "successfully joined all multicast groups\n");
 
         clear_bit(IPOIB_MCAST_RUN, &priv->flags);
diff --git a/drivers/infiniband/ulp/srp/ib_srp.c b/drivers/infiniband/ulp/srp/ib_srp.c
index 1b5b0c73005..922d845f76b 100644
--- a/drivers/infiniband/ulp/srp/ib_srp.c
+++ b/drivers/infiniband/ulp/srp/ib_srp.c
@@ -638,9 +638,9 @@ static void srp_reset_req(struct srp_target_port *target, struct srp_request *re
         struct scsi_cmnd *scmnd = srp_claim_req(target, req, NULL);
 
         if (scmnd) {
+                srp_free_req(target, req, scmnd, 0);
                 scmnd->result = DID_RESET << 16;
                 scmnd->scsi_done(scmnd);
-                srp_free_req(target, req, scmnd, 0);
         }
 }
 
@@ -1687,6 +1687,7 @@ static int srp_abort(struct scsi_cmnd *scmnd)
                           SRP_TSK_ABORT_TASK);
         srp_free_req(target, req, scmnd, 0);
         scmnd->result = DID_ABORT << 16;
+        scmnd->scsi_done(scmnd);
 
         return SUCCESS;
 }