diff options
| author |   Doug Ledford <dledford@redhat.com> | 2014-12-10 11:47:05 -0500 |
|---|---|---|
| committer |   Roland Dreier <roland@purestorage.com> | 2014-12-15 18:11:15 -0800 |
| commit | ce347ab90eaabc69a6146d41943981d51e7a9b82 (patch) | |
| tree | 7d8afaf45f93e9f96f93ad1cd8f1ce40da82a566 /drivers/infiniband/ulp/ipoib/ipoib.h | |
| parent | IPoIB: Make ipoib_mcast_stop_thread flush the workqueue (diff) | |
| download | linux-dev-ce347ab90eaabc69a6146d41943981d51e7a9b82.tar.xz linux-dev-ce347ab90eaabc69a6146d41943981d51e7a9b82.zip | |
IPoIB: No longer use flush as a parameter
Various places in the IPoIB code had a deadlock related to flushing
the ipoib workqueue. Now that we have per device workqueues and a
specific flush workqueue, there is no longer a deadlock issue with
flushing the device specific workqueues and we can do so unilaterally.
Signed-off-by: Doug Ledford <dledford@redhat.com>
Signed-off-by: Roland Dreier <roland@purestorage.com>
Diffstat (limited to 'drivers/infiniband/ulp/ipoib/ipoib.h')
| -rw-r--r-- | drivers/infiniband/ulp/ipoib/ipoib.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/infiniband/ulp/ipoib/ipoib.h b/drivers/infiniband/ulp/ipoib/ipoib.h index 28dc927c0e8b..8ba80a6d3a46 100644 --- a/drivers/infiniband/ulp/ipoib/ipoib.h +++ b/drivers/infiniband/ulp/ipoib/ipoib.h @@ -484,10 +484,10 @@ void ipoib_ib_dev_flush_heavy(struct work_struct *work); void ipoib_pkey_event(struct work_struct *work); void ipoib_ib_dev_cleanup(struct net_device *dev); -int ipoib_ib_dev_open(struct net_device *dev, int flush); +int ipoib_ib_dev_open(struct net_device *dev); int ipoib_ib_dev_up(struct net_device *dev); -int ipoib_ib_dev_down(struct net_device *dev, int flush); -int ipoib_ib_dev_stop(struct net_device *dev, int flush); +int ipoib_ib_dev_down(struct net_device *dev); +int ipoib_ib_dev_stop(struct net_device *dev); void ipoib_pkey_dev_check_presence(struct net_device *dev); int ipoib_dev_init(struct net_device *dev, struct ib_device *ca, int port); |