net/ice/base: fix inner L4 offset for GTPU dummy packet

[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 4d3136f..d1d266f 100644 (file)
--- a/drivers/net/ice/base/ice_protocol_type.h
+++ b/drivers/net/ice/base/ice_protocol_type.h
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2001-2020 Intel Corporation
+ * Copyright(c) 2001-2021 Intel Corporation
  */
 
 #ifndef _ICE_PROTOCOL_TYPE_H_
@@ -52,6 +52,8 @@ enum ice_protocol_type {
        ICE_AH,
        ICE_NAT_T,
        ICE_GTP_NO_PAY,
+       ICE_VLAN_EX,
+       ICE_VLAN_IN,
        ICE_PROTOCOL_LAST
 };
 
@@ -74,10 +76,26 @@ enum ice_sw_tunnel_type {
        ICE_SW_TUN_GTP,
        ICE_SW_TUN_IPV4_GTPU_NO_PAY,
        ICE_SW_TUN_IPV6_GTPU_NO_PAY,
-       ICE_SW_TUN_IPV4_GTPU_IPV4,
-       ICE_SW_TUN_IPV4_GTPU_IPV6,
-       ICE_SW_TUN_IPV6_GTPU_IPV4,
-       ICE_SW_TUN_IPV6_GTPU_IPV6,
+       ICE_SW_TUN_IPV4_GTPU_EH_IPV4,
+       ICE_SW_TUN_IPV4_GTPU_IPV4_UDP,
+       ICE_SW_TUN_IPV4_GTPU_EH_IPV4_UDP,
+       ICE_SW_TUN_IPV4_GTPU_IPV4_TCP,
+       ICE_SW_TUN_IPV4_GTPU_EH_IPV4_TCP,
+       ICE_SW_TUN_IPV4_GTPU_EH_IPV6,
+       ICE_SW_TUN_IPV4_GTPU_IPV6_UDP,
+       ICE_SW_TUN_IPV4_GTPU_EH_IPV6_UDP,
+       ICE_SW_TUN_IPV4_GTPU_IPV6_TCP,
+       ICE_SW_TUN_IPV4_GTPU_EH_IPV6_TCP,
+       ICE_SW_TUN_IPV6_GTPU_EH_IPV4,
+       ICE_SW_TUN_IPV6_GTPU_IPV4_UDP,
+       ICE_SW_TUN_IPV6_GTPU_EH_IPV4_UDP,
+       ICE_SW_TUN_IPV6_GTPU_IPV4_TCP,
+       ICE_SW_TUN_IPV6_GTPU_EH_IPV4_TCP,
+       ICE_SW_TUN_IPV6_GTPU_EH_IPV6,
+       ICE_SW_TUN_IPV6_GTPU_IPV6_UDP,
+       ICE_SW_TUN_IPV6_GTPU_EH_IPV6_UDP,
+       ICE_SW_TUN_IPV6_GTPU_IPV6_TCP,
+       ICE_SW_TUN_IPV6_GTPU_EH_IPV6_TCP,
        ICE_SW_TUN_PPPOE,
        ICE_SW_TUN_PPPOE_PAY,
        ICE_SW_TUN_PPPOE_IPV4,
@@ -102,6 +120,18 @@ enum ice_sw_tunnel_type {
        ICE_SW_TUN_PROFID_IPV4_PFCP_SESSION,
        ICE_SW_TUN_PROFID_IPV6_PFCP_NODE,
        ICE_SW_TUN_PROFID_IPV6_PFCP_SESSION,
+       ICE_SW_TUN_AND_NON_TUN_QINQ,
+       ICE_NON_TUN_QINQ,
+       ICE_SW_TUN_PPPOE_QINQ,
+       ICE_SW_TUN_PPPOE_PAY_QINQ,
+       ICE_SW_TUN_PPPOE_IPV4_QINQ,
+       ICE_SW_TUN_PPPOE_IPV6_QINQ,
+       ICE_SW_TUN_IPV4_GTPU_IPV4,
+       ICE_SW_TUN_IPV4_GTPU_IPV6,
+       ICE_SW_TUN_IPV6_GTPU_IPV4,
+       ICE_SW_TUN_IPV6_GTPU_IPV6,
+       ICE_SW_TUN_GTP_IPV4,
+       ICE_SW_TUN_GTP_IPV6,
        ICE_ALL_TUNNELS /* All tunnel types including NVGRE */
 };
 
@@ -146,6 +176,8 @@ enum ice_prot_id {
        ICE_PROT_OSPF           = 102,
        ICE_PROT_PPPOE          = 103,
        ICE_PROT_L2TPV3         = 104,
+       ICE_PROT_ECPRI          = 105,
+       ICE_PROT_PPP            = 106,
        ICE_PROT_ATAOE_OF       = 114,
        ICE_PROT_CTRL_OF        = 116,
        ICE_PROT_LLDP_OF        = 117,
@@ -160,6 +192,7 @@ enum ice_prot_id {
 #define ICE_MAC_OFOS_HW                1
 #define ICE_MAC_IL_HW          4
 #define ICE_ETYPE_OL_HW                9
+#define ICE_VLAN_OF_HW         16
 #define ICE_VLAN_OL_HW         17
 #define ICE_IPV4_OFOS_HW       32
 #define ICE_IPV4_IL_HW         33