diff options
| author |   David S. Miller <davem@davemloft.net> | 2021-10-22 11:41:16 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-10-22 11:41:16 +0100 |
| commit | bdfa75ad70e93633e18b1ed2b3866c01aa9bf9d2 (patch) | |
| tree | 45115e9c988cbaa49f3766cbe6e6775757cb8c20 /include/linux/mlx5/driver.h | |
| parent | Merge branch 'ax88796c-spi-ethernet-adapter' (diff) | |
| parent | Merge tag 'drm-fixes-2021-10-22' of git://anongit.freedesktop.org/drm/drm (diff) | |
| download | linux-dev-bdfa75ad70e93633e18b1ed2b3866c01aa9bf9d2.tar.xz linux-dev-bdfa75ad70e93633e18b1ed2b3866c01aa9bf9d2.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Lots of simnple overlapping additions.
With a build fix from Stephen Rothwell.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/mlx5/driver.h')
| -rw-r--r-- | include/linux/mlx5/driver.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/mlx5/driver.h b/include/linux/mlx5/driver.h index cf508685abca..3f4c0f2314a5 100644 --- a/include/linux/mlx5/driver.h +++ b/include/linux/mlx5/driver.h @@ -1138,7 +1138,6 @@ int mlx5_cmd_create_vport_lag(struct mlx5_core_dev *dev); int mlx5_cmd_destroy_vport_lag(struct mlx5_core_dev *dev); bool mlx5_lag_is_roce(struct mlx5_core_dev *dev); bool mlx5_lag_is_sriov(struct mlx5_core_dev *dev); -bool mlx5_lag_is_multipath(struct mlx5_core_dev *dev); bool mlx5_lag_is_active(struct mlx5_core_dev *dev); bool mlx5_lag_is_master(struct mlx5_core_dev *dev); bool mlx5_lag_is_shared_fdb(struct mlx5_core_dev *dev); |