diff options
| author |   Erez Shitrit <erezsh@mellanox.com> | 2013-10-16 17:37:50 +0300 |
|---|---|---|
| committer |   Roland Dreier <roland@purestorage.com> | 2013-11-08 14:42:49 -0800 |
| commit | aede25011fddf559dcf216d86975187e3f64b109 (patch) | |
| tree | 6dd40c15990dff4b266924394e16f20bbd02ba06 /drivers/infiniband/ulp/ipoib | |
| parent | IPoIB: Fix deadlock between dev_change_flags() and __ipoib_dev_flush() (diff) | |
| download | linux-dev-aede25011fddf559dcf216d86975187e3f64b109.tar.xz linux-dev-aede25011fddf559dcf216d86975187e3f64b109.zip | |
IPoIB: Avoid flushing the driver workqueue on dev_down
The driver should not flush the whole workqueue when only one work (the
pkey poll one) needs to be cancelled. Use cancel_delayed_work_sync()
instead.
Signed-off-by: Erez Shitrit <erezsh@mellanox.com>
Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: Roland Dreier <roland@purestorage.com>
Diffstat (limited to 'drivers/infiniband/ulp/ipoib')
| -rw-r--r-- | drivers/infiniband/ulp/ipoib/ipoib_ib.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_ib.c b/drivers/infiniband/ulp/ipoib/ipoib_ib.c index 01594de9b11d..ff64b1629dbf 100644 --- a/drivers/infiniband/ulp/ipoib/ipoib_ib.c +++ b/drivers/infiniband/ulp/ipoib/ipoib_ib.c @@ -749,10 +749,8 @@ int ipoib_ib_dev_down(struct net_device *dev, int flush) if (!test_bit(IPOIB_PKEY_ASSIGNED, &priv->flags)) { mutex_lock(&pkey_mutex); set_bit(IPOIB_PKEY_STOP, &priv->flags); - cancel_delayed_work(&priv->pkey_poll_task); + cancel_delayed_work_sync(&priv->pkey_poll_task); mutex_unlock(&pkey_mutex); - if (flush) - flush_workqueue(ipoib_workqueue); } ipoib_mcast_stop_thread(dev, flush); |