diff options
| author | David S. Miller <davem@davemloft.net> | 2017-07-03 13:42:10 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-07-03 13:42:10 +0300 |
| commit | 3a3f7d130eb5c219a1a4b183b92106028747dc85 (patch) | |
| tree | c089ee16fe465b94b473c92b834cab08ca57352d /include | |
| parent | 784c372a8184bdb8ae722c94250c2d57dc327a8e (diff) | |
| parent | ea23b42739a2c3c1158344928048fff8c70d1f66 (diff) | |
| download | linux-3a3f7d130eb5c219a1a4b183b92106028747dc85.tar.xz | |
Merge https://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Some overlapping changes in the mlx5 driver.
A merge conflict resolution posted by Stephen Rothwell was used as a
guide.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/mlx5/driver.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/mlx5/driver.h b/include/linux/mlx5/driver.h index 2ab4ae3e3a1a..df6ce59a1f95 100644 --- a/include/linux/mlx5/driver.h +++ b/include/linux/mlx5/driver.h @@ -946,6 +946,7 @@ void mlx5_start_health_poll(struct mlx5_core_dev *dev); void mlx5_stop_health_poll(struct mlx5_core_dev *dev); void mlx5_drain_health_wq(struct mlx5_core_dev *dev); void mlx5_trigger_health_work(struct mlx5_core_dev *dev); +void mlx5_drain_health_recovery(struct mlx5_core_dev *dev); int mlx5_buf_alloc_node(struct mlx5_core_dev *dev, int size, struct mlx5_buf *buf, int node); int mlx5_buf_alloc(struct mlx5_core_dev *dev, int size, struct mlx5_buf *buf); |