diff options
| author |   Saeed Mahameed <saeedm@mellanox.com> | 2018-12-14 11:15:25 -0800 |
|---|---|---|
| committer | Saeed Mahameed <saeedm@mellanox.com> | 2018-12-14 11:15:25 -0800 |
| commit | 64e4cf0dab16ad432fcbe7ac1109488e5a282c7b (patch) | |
| tree | 66b70716f95e2c65e640d4652535310cf85a43bc /drivers/infiniband/hw/mlx5/mlx5_ib.h | |
| parent | Merge branch 'Introduce-NETDEV_PRE_CHANGEADDR' (diff) | |
| parent | net/mlx5: Fold the modify lag code into function (diff) | |
| download | linux-dev-64e4cf0dab16ad432fcbe7ac1109488e5a282c7b.tar.xz linux-dev-64e4cf0dab16ad432fcbe7ac1109488e5a282c7b.zip | |
Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux
mlx5-next shared branch with rdma subtree to avoid mlx5 rdma v.s. netdev
conflicts.
Highlights:
1) Lag refactroing and flow counter affinity bits.
2) mlx5 core cleanups
By Roi Dayan (2) and others
* 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux:
net/mlx5: Fold the modify lag code into function
net/mlx5: Add lag affinity info to log
net/mlx5: Split the activate lag function into two routines
net/mlx5: E-Switch, Introduce flow counter affinity
IB/mlx5: Unify e-switch representors load approach between uplink and VFs
net/mlx5: Use lowercase 'X' for hex values
net/mlx5: Remove duplicated include from eswitch.c
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
Diffstat (limited to 'drivers/infiniband/hw/mlx5/mlx5_ib.h')
| -rw-r--r-- | drivers/infiniband/hw/mlx5/mlx5_ib.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/mlx5/mlx5_ib.h b/drivers/infiniband/hw/mlx5/mlx5_ib.h index 861b68f2e330..c89b3b44b22e 100644 --- a/drivers/infiniband/hw/mlx5/mlx5_ib.h +++ b/drivers/infiniband/hw/mlx5/mlx5_ib.h @@ -790,7 +790,6 @@ enum mlx5_ib_stages { MLX5_IB_STAGE_POST_IB_REG_UMR, MLX5_IB_STAGE_DELAY_DROP, MLX5_IB_STAGE_CLASS_ATTR, - MLX5_IB_STAGE_REP_REG, MLX5_IB_STAGE_MAX, }; |