diff options
| author |   David S. Miller <davem@davemloft.net> | 2021-03-12 16:36:07 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-03-12 16:36:07 -0800 |
| commit | c232f81b0a00f01c7dd1f888b806637c0d4b3d68 (patch) | |
| tree | 97fb9f113b7dea037b3a30890c27ea62fe5eaf49 /include/linux | |
| parent | docs: networking: phy: Improve placement of parenthesis (diff) | |
| parent | net/mlx5e: Allow to match on ICMP parameters (diff) | |
Merge tag 'mlx5-updates-2021-03-12' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux
Saeed Mahameed says:
====================
mlx5-updates-2021-03-12
1) TC support for ICMP parameters
2) TC connection tracking with mirroring
3) A round of trivial fixups and cleanups
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/mlx5/device.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/mlx5/device.h b/include/linux/mlx5/device.h index dc3d2508f5c6..92a029a800a0 100644 --- a/include/linux/mlx5/device.h +++ b/include/linux/mlx5/device.h @@ -1142,6 +1142,8 @@ enum mlx5_flex_parser_protos { MLX5_FLEX_PROTO_GENEVE = 1 << 3, MLX5_FLEX_PROTO_CW_MPLS_GRE = 1 << 4, MLX5_FLEX_PROTO_CW_MPLS_UDP = 1 << 5, + MLX5_FLEX_PROTO_ICMP = 1 << 8, + MLX5_FLEX_PROTO_ICMPV6 = 1 << 9, }; /* MLX5 DEV CAPs */ |