diff options
| author |   Saeed Mahameed <saeedm@mellanox.com> | 2019-07-04 16:40:32 -0400 |
|---|---|---|
| committer | Saeed Mahameed <saeedm@mellanox.com> | 2019-07-04 16:42:59 -0400 |
| commit | e08a976a16cafc20931db1d17aed9183202bfa8d (patch) | |
| tree | f2bfbc7013305d65f5647d4f8ec7fbd325a93b0a /drivers/infiniband/hw/mlx5/mlx5_ib.h | |
| parent | net: ethernet: mediatek: Fix overlapping capability bits. (diff) | |
| parent | net/mlx5: Add rts2rts_qp_counters_set_id field in hca cap (diff) | |
| download | linux-dev-e08a976a16cafc20931db1d17aed9183202bfa8d.tar.xz linux-dev-e08a976a16cafc20931db1d17aed9183202bfa8d.zip | |
Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux
Misc updates from mlx5-next branch:
1) Add the required HW definitions and structures for upcoming TLS
support.
2) Add support for MCQI and MCQS hardware registers for fw version query.
3) Added hardware bits and structures definitions for sub-functions
4) Small code cleanup and improvement for PF pci driver.
5) Bluefield (ECPF) updates and refactoring for better E-Switch
management on ECPF embedded CPU NIC:
5.1) Consolidate querying eswitch number of VFs
5.2) Register event handler at the correct E-Switch init stage
5.3) Setup PF's inline mode and vlan pop when the ECPF is the
E-Swtich manager ( the host PF is basically a VF ).
5.4) Handle Vport UC address changes in switchdev mode.
6) Cleanup the rep and netdev reference when unloading IB rep.
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
i# All conflicts fixed but you are still merging.
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 1c205c2bd486..ee73dc122d28 100644 --- a/drivers/infiniband/hw/mlx5/mlx5_ib.h +++ b/drivers/infiniband/hw/mlx5/mlx5_ib.h @@ -978,7 +978,6 @@ struct mlx5_ib_dev { u16 devx_whitelist_uid; struct mlx5_srq_table srq_table; struct mlx5_async_ctx async_ctx; - int free_port; }; static inline struct mlx5_ib_cq *to_mibcq(struct mlx5_core_cq *mcq) |