On Tue, Aug 26, 2025 at 10:35:37PM +0530, Shaiq Wani wrote: > Add L2TPv2 protocol identifier (ICE_PROT_L2TPV2OIP) and session ID > field definition (ICE_L2TPV2OIP_SESSION_ID) to the generic flow header. > > Signed-off-by: Shaiq Wani <[email protected]> > Tested-by: Song Jiale <[email protected]> > --- > drivers/net/intel/ice/ice_generic_flow.h | 129 ++++++++++++++++------- > 1 file changed, 88 insertions(+), 41 deletions(-) > > diff --git a/drivers/net/intel/ice/ice_generic_flow.h > b/drivers/net/intel/ice/ice_generic_flow.h > index 54bbb47398..deaf7b66e5 100644 > --- a/drivers/net/intel/ice/ice_generic_flow.h > +++ b/drivers/net/intel/ice/ice_generic_flow.h > @@ -9,15 +9,15 @@ > > /* protocol */ > > -#define ICE_PROT_MAC BIT_ULL(1) > -#define ICE_PROT_VLAN BIT_ULL(2) > -#define ICE_PROT_IPV4 BIT_ULL(3) > -#define ICE_PROT_IPV6 BIT_ULL(4) > -#define ICE_PROT_TCP BIT_ULL(5) > -#define ICE_PROT_UDP BIT_ULL(6) > -#define ICE_PROT_SCTP BIT_ULL(7) > -#define ICE_PROT_ICMP4 BIT_ULL(8) > -#define ICE_PROT_ICMP6 BIT_ULL(9) > +#define ICE_PROT_MAC_OUTER BIT_ULL(1) > +#define ICE_PROT_VLAN_OUTER BIT_ULL(2) > +#define ICE_PROT_IPV4_OUTER BIT_ULL(3) > +#define ICE_PROT_IPV6_OUTER BIT_ULL(4) > +#define ICE_PROT_TCP_OUTER BIT_ULL(5) > +#define ICE_PROT_UDP_OUTER BIT_ULL(6) > +#define ICE_PROT_SCTP_OUTER BIT_ULL(7) > +#define ICE_PROT_ICMP4_OUTER BIT_ULL(8) > +#define ICE_PROT_ICMP6_OUTER BIT_ULL(9) > #define ICE_PROT_VXLAN BIT_ULL(10) > #define ICE_PROT_NVGRE BIT_ULL(11) > #define ICE_PROT_GTPU BIT_ULL(12) > @@ -27,6 +27,16 @@ > #define ICE_PROT_L2TPV3OIP BIT_ULL(16) > #define ICE_PROT_PFCP BIT_ULL(17) > #define ICE_PROT_NAT_T_ESP BIT_ULL(18) > +#define ICE_PROT_L2TPV2OIP BIT_ULL(19) > +#define ICE_PROT_MAC_INNER BIT_ULL(20) > +#define ICE_PROT_VLAN_INNER BIT_ULL(21) > +#define ICE_PROT_IPV4_INNER BIT_ULL(22) > +#define ICE_PROT_IPV6_INNER BIT_ULL(23) > +#define ICE_PROT_TCP_INNER BIT_ULL(24) > +#define ICE_PROT_UDP_INNER BIT_ULL(25) > +#define ICE_PROT_SCTP_INNER BIT_ULL(26) > +#define ICE_PROT_ICMP4_INNER BIT_ULL(27) > +#define ICE_PROT_ICMP6_INNER BIT_ULL(28) >
This patch has a lot of renaming going on and most of the changes are renames unrelated (as far as I can see) to L2TP as described in the commit log. Please split this patch into two, with first patch doing all the renaming of existing values. Then you can have a second patch that adds the new L2TP parts. /Bruce
