net/ice/base: rename and add setter for unicast MAC flag

[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 ee1f29d..cef8354 100644 (file)
--- a/drivers/net/ice/base/ice_protocol_type.h
+++ b/drivers/net/ice/base/ice_protocol_type.h
@@ -53,6 +53,7 @@ enum ice_protocol_type {
        ICE_NAT_T,
        ICE_GTP_NO_PAY,
        ICE_VLAN_EX,
+       ICE_VLAN_IN,
        ICE_PROTOCOL_LAST
 };
 
@@ -75,6 +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_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,
@@ -109,6 +130,8 @@ enum ice_sw_tunnel_type {
        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 */
 };
 
@@ -136,8 +159,10 @@ enum ice_prot_id {
        ICE_PROT_MPLS_IL        = 29,
        ICE_PROT_IPV4_OF_OR_S   = 32,
        ICE_PROT_IPV4_IL        = 33,
+       ICE_PROT_IPV4_IL_IL     = 34,
        ICE_PROT_IPV6_OF_OR_S   = 40,
        ICE_PROT_IPV6_IL        = 41,
+       ICE_PROT_IPV6_IL_IL     = 42,
        ICE_PROT_IPV6_FRAG      = 47,
        ICE_PROT_TCP_IL         = 49,
        ICE_PROT_UDP_OF         = 52,
@@ -154,6 +179,7 @@ enum ice_prot_id {
        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,
@@ -221,8 +247,8 @@ struct ice_ether_vlan_hdr {
 };
 
 struct ice_vlan_hdr {
-       __be16 vlan;
        __be16 type;
+       __be16 vlan;
 };
 
 struct ice_ipv4_hdr {