diff options
author | Saeed Mahameed <saeedm@mellanox.com> | 2018-07-23 14:58:46 -0700 |
---|---|---|
committer | Saeed Mahameed <saeedm@mellanox.com> | 2018-07-23 14:58:46 -0700 |
commit | 7854ac44fe86548f8a6c6001938a1a2593b255e4 (patch) | |
tree | dc0a0fb20902d4c25c9a39b1a14679ce9faa7738 /drivers/infiniband/hw/mlx5/cmd.h | |
parent | c9eaaa1773982e30fcb6e9f2e2db878490c0f730 (diff) | |
parent | 048f31437ac5da336cf08e13f5fdc8add6a9bb16 (diff) | |
download | linux-7854ac44fe86548f8a6c6001938a1a2593b255e4.tar.gz linux-7854ac44fe86548f8a6c6001938a1a2593b255e4.tar.bz2 linux-7854ac44fe86548f8a6c6001938a1a2593b255e4.zip |
Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux
mlx5 core infrastructure updates and fixes.
From Eran:
- Add MPEGC (Management PCIe General Configuration) registers and btis
- Fix tristate and description for MLX5 module
rom Feras:
- Add hardware structures for the firmware tracer
From Jainbo:
- Core support for double vlan push/pop steering action
From Max:
- Add XRQ commands definitions
From Noa:
- Add missing SET_DRIVER_VERSION command translation
From Roi:
- Use ERR_CAST() instead of coding it
From Tariq:
- Better return types for CQE API
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
Diffstat (limited to 'drivers/infiniband/hw/mlx5/cmd.h')
-rw-r--r-- | drivers/infiniband/hw/mlx5/cmd.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/infiniband/hw/mlx5/cmd.h b/drivers/infiniband/hw/mlx5/cmd.h index e7206c8a8011..98ea4648c655 100644 --- a/drivers/infiniband/hw/mlx5/cmd.h +++ b/drivers/infiniband/hw/mlx5/cmd.h @@ -37,6 +37,7 @@ #include <linux/kernel.h> #include <linux/mlx5/driver.h> +int mlx5_cmd_dump_fill_mkey(struct mlx5_core_dev *dev, u32 *mkey); int mlx5_cmd_null_mkey(struct mlx5_core_dev *dev, u32 *null_mkey); int mlx5_cmd_query_cong_params(struct mlx5_core_dev *dev, int cong_point, void *out, int out_size); |