diff options
author | Leon Romanovsky <leon@kernel.org> | 2022-09-05 15:09:55 +0300 |
---|---|---|
committer | Leon Romanovsky <leon@kernel.org> | 2022-09-05 15:09:55 +0300 |
commit | d324a46be33ed0c1730ed8194345fce83eeba0e8 (patch) | |
tree | 49cd4b7522ffa5f106f1c7ee4db45cb5f0839f9d /include/linux/mlx5 | |
parent | b021d82e2503e3704672221bfa3028f30e749cc5 (diff) | |
parent | 8a2dd123f12f69e5373d3103da2c97fc36223e0c (diff) | |
download | linux-d324a46be33ed0c1730ed8194345fce83eeba0e8.tar.xz |
Merge branch 'mlx5-next' into wip/leon-for-next
Perform merge of Mellanox shared branch.
* mlx5-next:
RDMA/mlx5: Move function mlx5_core_query_ib_ppcnt() to mlx5_ib
Diffstat (limited to 'include/linux/mlx5')
-rw-r--r-- | include/linux/mlx5/driver.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/mlx5/driver.h b/include/linux/mlx5/driver.h index 96b16fbe1aa4..9ccfd9dd0d0f 100644 --- a/include/linux/mlx5/driver.h +++ b/include/linux/mlx5/driver.h @@ -1084,8 +1084,6 @@ int mlx5_core_destroy_psv(struct mlx5_core_dev *dev, int psv_num); void mlx5_core_put_rsc(struct mlx5_core_rsc_common *common); int mlx5_query_odp_caps(struct mlx5_core_dev *dev, struct mlx5_odp_caps *odp_caps); -int mlx5_core_query_ib_ppcnt(struct mlx5_core_dev *dev, - u8 port_num, void *out, size_t sz); int mlx5_init_rl_table(struct mlx5_core_dev *dev); void mlx5_cleanup_rl_table(struct mlx5_core_dev *dev); |