diff options
| author | Roland Dreier <roland@purestorage.com> | 2015-01-30 15:38:35 -0800 |
|---|---|---|
| committer | Roland Dreier <roland@purestorage.com> | 2015-01-30 15:38:35 -0800 |
| commit | a84544a4feb2cf5cafdf3cce3269da0c3b4fcc45 (patch) | |
| tree | cda74ea73fd10f3775e1ee0585d7b1048af9380b /drivers/infiniband/ulp/ipoib/ipoib.h | |
| parent | eaa27f34e91a14cdceed26ed6c6793ec1d186115 (diff) | |
| download | op-kernel-dev-a84544a4feb2cf5cafdf3cce3269da0c3b4fcc45.zip op-kernel-dev-a84544a4feb2cf5cafdf3cce3269da0c3b4fcc45.tar.gz | |
Revert "IPoIB: No longer use flush as a parameter"
This reverts commit ce347ab90eaabc69a6146d41943981d51e7a9b82.
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.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 8ba80a6..28dc927 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 ipoib_ib_dev_open(struct net_device *dev, int flush); int ipoib_ib_dev_up(struct net_device *dev); -int ipoib_ib_dev_down(struct net_device *dev); -int ipoib_ib_dev_stop(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); void ipoib_pkey_dev_check_presence(struct net_device *dev); int ipoib_dev_init(struct net_device *dev, struct ib_device *ca, int port); |
