diff options
| author | David S. Miller <davem@davemloft.net> | 2020-03-19 03:13:37 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-03-19 03:13:37 +0100 |
| commit | 79e28519ac78dde6d38fe6ea22286af574f5c7db (patch) | |
| tree | 0fde253beff6cfaa7c01e99a3a8054caa7aace75 /include | |
| parent | net: phy: realtek: read actual speed to detect downshift (diff) | |
| parent | net/mlx5: Avoid forwarding to other eswitch uplink (diff) | |
| download | linux-79e28519ac78dde6d38fe6ea22286af574f5c7db.tar.xz linux-79e28519ac78dde6d38fe6ea22286af574f5c7db.zip | |
Merge tag 'mlx5-updates-2020-03-17' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux
Saeed Mahameed says:
====================
mlx5-updates-2020-03-17
1) Compiler warnings and cleanup for the connection tracking series
2) Bug fixes for the connection tracking series
3) Fix devlink port register sequence
4) Last five patches in the series, By Eli cohen
Add the support for forwarding traffic between two eswitch uplink
representors (Hairpin for eswitch), using mlx5 termination tables
to change the direction of a packet in hw from RX to TX pipeline.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/mlx5/mlx5_ifc.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/mlx5/mlx5_ifc.h b/include/linux/mlx5/mlx5_ifc.h index 2bd920965bd3..cc55cee3b53c 100644 --- a/include/linux/mlx5/mlx5_ifc.h +++ b/include/linux/mlx5/mlx5_ifc.h @@ -416,7 +416,8 @@ struct mlx5_ifc_flow_table_prop_layout_bits { u8 termination_table[0x1]; u8 reformat_and_fwd_to_table[0x1]; u8 reserved_at_1a[0x6]; - u8 reserved_at_20[0x2]; + u8 termination_table_raw_traffic[0x1]; + u8 reserved_at_21[0x1]; u8 log_max_ft_size[0x6]; u8 log_max_modify_header_context[0x8]; u8 max_modify_header_actions[0x8]; |