diff options
| author |   Roland Dreier <roland@purestorage.com> | 2015-01-30 15:39:36 -0800 |
|---|---|---|
| committer | Roland Dreier <roland@purestorage.com> | 2015-01-30 15:39:36 -0800 |
| commit | 4143a9515d355857aeaa151a63cf21dd061151d9 (patch) | |
| tree | fb472fd8256818d5514b8211c532985978b920dd /drivers/infiniband/ulp/ipoib | |
| parent | Revert "IPoIB: Make the carrier_on_task race aware" (diff) | |
| download | linux-dev-4143a9515d355857aeaa151a63cf21dd061151d9.tar.xz linux-dev-4143a9515d355857aeaa151a63cf21dd061151d9.zip | |
Revert "IPoIB: Consolidate rtnl_lock tasks in workqueue"
This reverts commit afe1de664ef3cb756e70938d99417dcbc6b1379a.
The series of IPoIB bug fixes that went into 3.19-rc1 introduce
regressions, and after trying to sort things out, we decided to revert
to 3.18's IPoIB driver and get things right for 3.20.
Signed-off-by: Roland Dreier <roland@purestorage.com>
Diffstat (limited to 'drivers/infiniband/ulp/ipoib')
| -rw-r--r-- | drivers/infiniband/ulp/ipoib/ipoib_multicast.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c index eee66d13e5b9..ffb83b5f7e80 100644 --- a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c +++ b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c @@ -190,6 +190,12 @@ static int ipoib_mcast_join_finish(struct ipoib_mcast *mcast, 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)) { @@ -365,8 +371,6 @@ void ipoib_mcast_carrier_on_task(struct work_struct *work) } rtnl_lock(); - if (!ipoib_cm_admin_enabled(priv->dev)) - dev_set_mtu(priv->dev, min(priv->mcast_mtu, priv->admin_mtu)); netif_carrier_on(priv->dev); rtnl_unlock(); } |