diff options
| author | Roland Dreier <roland@purestorage.com> | 2015-01-30 15:38:55 -0800 |
|---|---|---|
| committer | Roland Dreier <roland@purestorage.com> | 2015-01-30 15:38:55 -0800 |
| commit | 0306eda2269f961d77c09b1badc0031438c21f44 (patch) | |
| tree | c9af7b5686f9e831d6d58dae9ce7c41df86b97dc /drivers/infiniband/ulp/ipoib/ipoib_ib.c | |
| parent | 4e0ab200fa4594d16bb7fc697ec4d9edfb5a43f0 (diff) | |
| download | linux-0306eda2269f961d77c09b1badc0031438c21f44.tar.gz linux-0306eda2269f961d77c09b1badc0031438c21f44.tar.bz2 linux-0306eda2269f961d77c09b1badc0031438c21f44.zip | |
Revert "IPoIB: Use dedicated workqueues per interface"
This reverts commit 5141861cd5e17eac9676ff49c5abfafbea2b0e98.
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/ipoib_ib.c')
| -rw-r--r-- | drivers/infiniband/ulp/ipoib/ipoib_ib.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_ib.c b/drivers/infiniband/ulp/ipoib/ipoib_ib.c index bfd17d41b5f2..72626c348174 100644 --- a/drivers/infiniband/ulp/ipoib/ipoib_ib.c +++ b/drivers/infiniband/ulp/ipoib/ipoib_ib.c @@ -655,7 +655,7 @@ void ipoib_reap_ah(struct work_struct *work) __ipoib_reap_ah(dev); if (!test_bit(IPOIB_STOP_REAPER, &priv->flags)) - queue_delayed_work(priv->wq, &priv->ah_reap_task, + queue_delayed_work(ipoib_workqueue, &priv->ah_reap_task, round_jiffies_relative(HZ)); } @@ -696,7 +696,7 @@ int ipoib_ib_dev_open(struct net_device *dev, int flush) } clear_bit(IPOIB_STOP_REAPER, &priv->flags); - queue_delayed_work(priv->wq, &priv->ah_reap_task, + queue_delayed_work(ipoib_workqueue, &priv->ah_reap_task, round_jiffies_relative(HZ)); if (!test_and_set_bit(IPOIB_FLAG_INITIALIZED, &priv->flags)) @@ -881,7 +881,7 @@ timeout: set_bit(IPOIB_STOP_REAPER, &priv->flags); cancel_delayed_work(&priv->ah_reap_task); if (flush) - flush_workqueue(priv->wq); + flush_workqueue(ipoib_workqueue); begin = jiffies; |