diff options
| author | David S. Miller <davem@davemloft.net> | 2016-10-29 23:23:49 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-10-29 23:23:49 +0300 |
| commit | e59cc767b6517e78f2d64e5b438e8ac2692d0a1f (patch) | |
| tree | c679c85b13a9b843f7a192a525c32e2473932cfe /include/linux | |
| parent | ff57087f314be8d458dca6bdd41be5b4236482a0 (diff) | |
| parent | eb4b678825992aa434d32b2f615d2090281e0f88 (diff) | |
| download | linux-e59cc767b6517e78f2d64e5b438e8ac2692d0a1f.tar.xz | |
Merge branch 'mlx4-fixes'
Tariq Toukan says:
====================
mlx4 misc fixes for 4.9
This patchset contains several bug fixes from the team to the
mlx4 Eth and Core drivers.
Series generated against net commit:
ecc515d7238f 'sctp: fix the panic caused by route update'
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/mlx4/device.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/mlx4/device.h b/include/linux/mlx4/device.h index f6a164297358..3be7abd6e722 100644 --- a/include/linux/mlx4/device.h +++ b/include/linux/mlx4/device.h @@ -1399,7 +1399,8 @@ void mlx4_fmr_unmap(struct mlx4_dev *dev, struct mlx4_fmr *fmr, u32 *lkey, u32 *rkey); int mlx4_fmr_free(struct mlx4_dev *dev, struct mlx4_fmr *fmr); int mlx4_SYNC_TPT(struct mlx4_dev *dev); -int mlx4_test_interrupts(struct mlx4_dev *dev); +int mlx4_test_interrupt(struct mlx4_dev *dev, int vector); +int mlx4_test_async(struct mlx4_dev *dev); int mlx4_query_diag_counters(struct mlx4_dev *dev, u8 op_modifier, const u32 offset[], u32 value[], size_t array_len, u8 port); |