Saeed Mahameed says: ==================== Mellanox, mlx5 fixes 2019-08-08 This series introduces some fixes to mlx5 driver. Highlights: 1) From Tariq, Critical mlx5 kTLS fixes to better align with hw specs. 2) From Aya, Fixes to mlx5 tx devlink health reporter. 3) From Maxim, aRFs parsing to use flow dissector to avoid relying on invalid skb fields. Please pull and let me know if there is any problem. For -stable v4.3 ('net/mlx5e: Only support tx/rx pause setting for port owner') For -stable v4.9 ('net/mlx5e: Use flow keys dissector to parse packets for ARFS') For -stable v5.1 ('net/mlx5e: Fix false negative indication on tx reporter CQE recovery') ('net/mlx5e: Remove redundant check in CQE recovery flow of tx reporter') ('net/mlx5e: ethtool, Avoid setting speed to 56GBASE when autoneg off') Note: when merged with net-next this minor conflict will pop up: ++<<<<<<< (net-next) + if (is_eswitch_flow) { + flow->esw_attr->match_level = match_level; + flow->esw_attr->tunnel_match_level = tunnel_match_level; ++======= + if (flow->flags & MLX5E_TC_FLOW_ESWITCH) { + flow->esw_attr->inner_match_level = inner_match_level; + flow->esw_attr->outer_match_level = outer_match_level; ++>>>>>>> (net) To resolve, use hunks from net (2nd) and replace: if (flow->flags & MLX5E_TC_FLOW_ESWITCH) with if (is_eswitch_flow) ====================
Showing the changes to include/linux (2 of 13 files). Show all
Unified · Split
| @@ -446,11 +446,11 @@ enum { · 445 unmodified lines | ||
| 446 | 446 | }; |
| 447 | 447 | |
| 448 | 448 | enum { |
| 449 | − MLX5_OPC_MOD_TLS_TIS_STATIC_PARAMS = 0x20, | |
| 449 | + MLX5_OPC_MOD_TLS_TIS_STATIC_PARAMS = 0x1, | |
| 450 | 450 | }; |
| 451 | 451 | |
| 452 | 452 | enum { |
| 453 | − MLX5_OPC_MOD_TLS_TIS_PROGRESS_PARAMS = 0x20, | |
| 453 | + MLX5_OPC_MOD_TLS_TIS_PROGRESS_PARAMS = 0x1, | |
| 454 | 454 | }; |
| 455 | 455 | |
| 456 | 456 | enum { |
| @@ -10054,9 +10054,8 @@ struct mlx5_ifc_tls_static_params_bits { · 10053 unmodified lines | ||
| 10054 | 10054 | }; |
| 10055 | 10055 | |
| 10056 | 10056 | struct mlx5_ifc_tls_progress_params_bits { |
| 10057 | − u8 valid[0x1]; | |
| 10058 | − u8 reserved_at_1[0x7]; | |
| 10059 | − u8 pd[0x18]; | |
| 10057 | + u8 reserved_at_0[0x8]; | |
| 10058 | + u8 tisn[0x18]; | |
| 10060 | 10059 | |
| 10061 | 10060 | u8 next_record_tcp_sn[0x20]; |
| 10062 | 10061 | |