net/ice/base: support more PPPoE packet type

[dpdk.git] / drivers / net / ice / base / ice_protocol_type.h

diff --git a/drivers/net/ice/base/ice_protocol_type.h b/drivers/net/ice/base/ice_protocol_type.h
index b75a340..85af751 100644 (file)
--- a/drivers/net/ice/base/ice_protocol_type.h
+++ b/drivers/net/ice/base/ice_protocol_type.h
@@ -58,14 +58,23 @@ enum ice_sw_tunnel_type {
        ICE_NON_TUN = 0,
        ICE_SW_TUN_AND_NON_TUN,
        ICE_SW_TUN_VXLAN_GPE,
-       ICE_SW_TUN_GENEVE,
-       ICE_SW_TUN_VXLAN,
+       ICE_SW_TUN_GENEVE,      /* GENEVE matches only non-VLAN pkts */
+       ICE_SW_TUN_GENEVE_VLAN, /* GENEVE matches both VLAN and non-VLAN pkts */
+       ICE_SW_TUN_VXLAN,       /* VXLAN matches only non-VLAN pkts */
+       ICE_SW_TUN_VXLAN_VLAN,  /* VXLAN matches both VLAN and non-VLAN pkts */
        ICE_SW_TUN_NVGRE,
        ICE_SW_TUN_UDP, /* This means all "UDP" tunnel types: VXLAN-GPE, VXLAN
                         * and GENEVE
                         */
        ICE_SW_TUN_GTP,
        ICE_SW_TUN_PPPOE,
+       ICE_SW_TUN_PPPOE_PAY,
+       ICE_SW_TUN_PPPOE_IPV4,
+       ICE_SW_TUN_PPPOE_IPV4_TCP,
+       ICE_SW_TUN_PPPOE_IPV4_UDP,
+       ICE_SW_TUN_PPPOE_IPV6,
+       ICE_SW_TUN_PPPOE_IPV6_TCP,
+       ICE_SW_TUN_PPPOE_IPV6_UDP,
        ICE_SW_TUN_IPV4_ESP,
        ICE_SW_TUN_IPV6_ESP,
        ICE_SW_TUN_IPV4_AH,
@@ -165,6 +174,7 @@ enum ice_prot_id {
 #define ICE_TUN_FLAG_MDID 21
 #define ICE_TUN_FLAG_MDID_OFF (ICE_MDID_SIZE * ICE_TUN_FLAG_MDID)
 #define ICE_TUN_FLAG_MASK 0xFF
+#define ICE_TUN_FLAG_VLAN_MASK 0x01
 #define ICE_TUN_FLAG_FV_IND 2
 
 #define ICE_PROTOCOL_MAX_ENTRIES 16