diff options
author | Saeed Mahameed | 2019-02-16 00:16:36 +0100 |
---|---|---|
committer | Saeed Mahameed | 2019-02-16 01:45:31 +0100 |
commit | 259fae5a2cff72e19f82094fb73e2149f8d64396 (patch) | |
tree | c90cc44f078422b73bc4a40dd67ff020ec2e006b /drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | |
parent | sfc: ensure recovery after allocation failures (diff) | |
parent | IB/mlx5: Add support for 50Gbps per lane link modes (diff) | |
download | kernel-qcow2-linux-259fae5a2cff72e19f82094fb73e2149f8d64396.tar.gz kernel-qcow2-linux-259fae5a2cff72e19f82094fb73e2149f8d64396.tar.xz kernel-qcow2-linux-259fae5a2cff72e19f82094fb73e2149f8d64396.zip |
Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux
Merge mlx5-next shared branched into net-next,
From Bodong Wang:
1) Introduction of ECPF (Embedded CPU Physical Function), and low level
bits for mlx5 SmartNic capabilities support.
2) Vport enumeration refactoring that affect mlx5_ib and mlx5_core
From Aya Levin,
3) Add support for 50Gbps per lane link modes in the Port Type and Speed
register (PTYS)
4) Refactor low level query functions for PTYS register
5) Add support for 50Gbps per lane link modes to mlx5_ib
Note: due to a change in API in mlx5/core and a later patch from net-next,
a fixup was squashed with this merge commit that replaces FDB_UPLINK_VPORT
with MLX5_VPORT_UPLINK which exists only in upstream net-next.
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
Diffstat (limited to 'drivers/net/ethernet/mellanox/mlx5/core/eswitch.h')
-rw-r--r-- | drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.h b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.h index 748ff178a1d6..0a3eee8746c1 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.h +++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.h @@ -49,8 +49,6 @@ #define MLX5_MAX_MC_PER_VPORT(dev) \ (1 << MLX5_CAP_GEN(dev, log_max_current_mc_list)) -#define FDB_UPLINK_VPORT 0xffff - #define MLX5_MIN_BW_SHARE 1 #define MLX5_RATE_TO_BW_SHARE(rate, divider, limit) \ |