diff options
| author | Jason Gunthorpe <jgg@mellanox.com> | 2019-07-05 10:16:19 -0300 |
|---|---|---|
| committer | Jason Gunthorpe <jgg@mellanox.com> | 2019-07-05 10:16:19 -0300 |
| commit | 5600a410ea24cb8467abdd4b8530961ff4f14907 (patch) | |
| tree | 572b909f0c6cf4985e1d063f897e371ea0162995 /include/linux/mlx5/qp.h | |
| parent | bcde9a83b13ede042fd76e4cf0b759b6d6c0abe9 (diff) | |
| parent | f8efee08dd9d41ab71010e9b16c9ead51753b7d6 (diff) | |
Merge mlx5-next into rdma for-next
From git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux
Required for dependencies in the next patches.
* mlx5-next:
net/mlx5: Add rts2rts_qp_counters_set_id field in hca cap
net/mlx5: Properly name the generic WQE control field
net/mlx5: Introduce TLS TX offload hardware bits and structures
net/mlx5: Refactor mlx5_esw_query_functions for modularity
net/mlx5: E-Switch prepare functions change handler to be modular
net/mlx5: Introduce and use mlx5_eswitch_get_total_vports()
Diffstat (limited to 'include/linux/mlx5/qp.h')
| -rw-r--r-- | include/linux/mlx5/qp.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/include/linux/mlx5/qp.h b/include/linux/mlx5/qp.h index 90f5f889742d..937041101504 100644 --- a/include/linux/mlx5/qp.h +++ b/include/linux/mlx5/qp.h @@ -203,7 +203,12 @@ struct mlx5_wqe_ctrl_seg { u8 signature; u8 rsvd[2]; u8 fm_ce_se; - __be32 imm; + union { + __be32 general_id; + __be32 imm; + __be32 umr_mkey; + __be32 tisn; + }; }; #define MLX5_WQE_CTRL_DS_MASK 0x3f |