diff options
| author | David S. Miller <davem@davemloft.net> | 2020-02-07 01:26:18 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-02-07 01:26:18 +0300 |
| commit | f798a5a0a60575f329ff29b13360bf4a14cc90d1 (patch) | |
| tree | 01f889d515f5f464486a872c44bc9ee3b68fdfe1 /include/linux | |
| parent | 263a425a482fc495d6d3f9a29b9103a664c38b69 (diff) | |
| parent | 61c00cca41aeeaa8e5263c2f81f28534bc1efafb (diff) | |
| download | linux-f798a5a0a60575f329ff29b13360bf4a14cc90d1.tar.xz | |
Merge tag 'mlx5-fixes-2020-02-06' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux
Saeed Mahameed says:
====================
Mellanox, mlx5 fixes 2020-02-06
This series introduces some fixes to mlx5 driver.
Please pull and let me know if there is any problem.
For -stable v4.19:
('net/mlx5: IPsec, Fix esp modify function attribute')
('net/mlx5: IPsec, fix memory leak at mlx5_fpga_ipsec_delete_sa_ctx')
For -stable v5.4:
('net/mlx5: Deprecate usage of generic TLS HW capability bit')
('net/mlx5: Fix deadlock in fs_core')
For -stable v5.5:
('net/mlx5e: TX, Error completion is for last WQE in batch')
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/mlx5/mlx5_ifc.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/linux/mlx5/mlx5_ifc.h b/include/linux/mlx5/mlx5_ifc.h index 032cd6630720..ff8c9d527bb4 100644 --- a/include/linux/mlx5/mlx5_ifc.h +++ b/include/linux/mlx5/mlx5_ifc.h @@ -1448,14 +1448,15 @@ struct mlx5_ifc_cmd_hca_cap_bits { u8 reserved_at_440[0x20]; - u8 tls[0x1]; - u8 reserved_at_461[0x2]; + u8 reserved_at_460[0x3]; u8 log_max_uctx[0x5]; u8 reserved_at_468[0x3]; u8 log_max_umem[0x5]; u8 max_num_eqs[0x10]; - u8 reserved_at_480[0x3]; + u8 reserved_at_480[0x1]; + u8 tls_tx[0x1]; + u8 reserved_at_482[0x1]; u8 log_max_l2_table[0x5]; u8 reserved_at_488[0x8]; u8 log_uar_page_sz[0x10]; |