diff options
author | Saeed Mahameed | 2018-12-11 00:43:47 +0100 |
---|---|---|
committer | Saeed Mahameed | 2018-12-11 00:50:50 +0100 |
commit | 2f62747c77e2e5a8acb720aaec9ee4860d55118f (patch) | |
tree | ec4b02de31627ae7ff4850fe519cefa86d97d028 /drivers/net/ethernet/mellanox/mlx5/core/en.h | |
parent | tcp: handle EOR and FIN conditions the same in tcp_tso_should_defer() (diff) | |
parent | net/mlx5: Remove the get protocol device interface entry (diff) | |
download | kernel-qcow2-linux-2f62747c77e2e5a8acb720aaec9ee4860d55118f.tar.gz kernel-qcow2-linux-2f62747c77e2e5a8acb720aaec9ee4860d55118f.tar.xz kernel-qcow2-linux-2f62747c77e2e5a8acb720aaec9ee4860d55118f.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) RDMA ODP (On Demand Paging) improvements and moving ODP logic to
mlx5 RDMA driver
2) Improved mlx5 core driver and device events handling and provided API
for upper layers to subscribe to device events.
3) RDMA only code cleanup from mlx5 core
4) Add helper to get CQE opcode
5) Rework handling of port module events
6) shared mlx5_ifc.h updates to avoid conflicts
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
Diffstat (limited to 'drivers/net/ethernet/mellanox/mlx5/core/en.h')
-rw-r--r-- | drivers/net/ethernet/mellanox/mlx5/core/en.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en.h b/drivers/net/ethernet/mellanox/mlx5/core/en.h index 8760d10ad5a1..9ea0f853c3bb 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en.h +++ b/drivers/net/ethernet/mellanox/mlx5/core/en.h @@ -176,8 +176,7 @@ static inline int mlx5e_get_max_num_channels(struct mlx5_core_dev *mdev) { return is_kdump_kernel() ? MLX5E_MIN_NUM_CHANNELS : - min_t(int, mdev->priv.eq_table.num_comp_vectors, - MLX5E_MAX_NUM_CHANNELS); + min_t(int, mlx5_comp_vectors_count(mdev), MLX5E_MAX_NUM_CHANNELS); } /* Use this function to get max num channels after netdev was created */ @@ -629,7 +628,6 @@ struct mlx5e_channel_stats { } ____cacheline_aligned_in_smp; enum { - MLX5E_STATE_ASYNC_EVENTS_ENABLED, MLX5E_STATE_OPENED, MLX5E_STATE_DESTROYING, }; @@ -696,6 +694,8 @@ struct mlx5e_priv { struct hwtstamp_config tstamp; u16 q_counter; u16 drop_rq_q_counter; + struct notifier_block events_nb; + #ifdef CONFIG_MLX5_CORE_EN_DCB struct mlx5e_dcbx dcbx; #endif |