-#define ICE_INSET_NONE 0ULL
-
-/* non-tunnel */
-
-#define ICE_INSET_SMAC (ICE_PROT_MAC_OUTER | ICE_SMAC)
-#define ICE_INSET_DMAC (ICE_PROT_MAC_OUTER | ICE_DMAC)
-#define ICE_INSET_VLAN_INNER (ICE_PROT_VLAN_INNER)
-#define ICE_INSET_VLAN_OUTER (ICE_PROT_VLAN_OUTER)
-#define ICE_INSET_ETHERTYPE (ICE_ETHERTYPE)
-
-#define ICE_INSET_IPV4_SRC \
- (ICE_PROT_IPV4_OUTER | ICE_IP_SRC)
-#define ICE_INSET_IPV4_DST \
- (ICE_PROT_IPV4_OUTER | ICE_IP_DST)
-#define ICE_INSET_IPV4_TOS \
- (ICE_PROT_IPV4_OUTER | ICE_IP_TOS)
-#define ICE_INSET_IPV4_PROTO \
- (ICE_PROT_IPV4_OUTER | ICE_IP_PROTO)
-#define ICE_INSET_IPV4_TTL \
- (ICE_PROT_IPV4_OUTER | ICE_IP_TTL)
-#define ICE_INSET_IPV6_SRC \
- (ICE_PROT_IPV6_OUTER | ICE_IP_SRC)
-#define ICE_INSET_IPV6_DST \
- (ICE_PROT_IPV6_OUTER | ICE_IP_DST)
-#define ICE_INSET_IPV6_NEXT_HDR \
- (ICE_PROT_IPV6_OUTER | ICE_IP_PROTO)
-#define ICE_INSET_IPV6_HOP_LIMIT \
- (ICE_PROT_IPV6_OUTER | ICE_IP_TTL)
-#define ICE_INSET_IPV6_TC \
- (ICE_PROT_IPV6_OUTER | ICE_IP_TOS)
-
-#define ICE_INSET_TCP_SRC_PORT \
- (ICE_PROT_TCP_OUTER | ICE_SPORT)
-#define ICE_INSET_TCP_DST_PORT \
- (ICE_PROT_TCP_OUTER | ICE_DPORT)
-#define ICE_INSET_UDP_SRC_PORT \
- (ICE_PROT_UDP_OUTER | ICE_SPORT)
-#define ICE_INSET_UDP_DST_PORT \
- (ICE_PROT_UDP_OUTER | ICE_DPORT)
-#define ICE_INSET_SCTP_SRC_PORT \
- (ICE_PROT_SCTP_OUTER | ICE_SPORT)
-#define ICE_INSET_SCTP_DST_PORT \
- (ICE_PROT_SCTP_OUTER | ICE_DPORT)
-#define ICE_INSET_ICMP4_SRC_PORT \
- (ICE_PROT_ICMP4_OUTER | ICE_SPORT)
-#define ICE_INSET_ICMP4_DST_PORT \
- (ICE_PROT_ICMP4_OUTER | ICE_DPORT)
-#define ICE_INSET_ICMP6_SRC_PORT \
- (ICE_PROT_ICMP6_OUTER | ICE_SPORT)
-#define ICE_INSET_ICMP6_DST_PORT \
- (ICE_PROT_ICMP6_OUTER | ICE_DPORT)
-#define ICE_INSET_ICMP4_TYPE \
- (ICE_PROT_ICMP4_OUTER | ICE_ICMP_TYPE)
-#define ICE_INSET_ICMP4_CODE \
- (ICE_PROT_ICMP4_OUTER | ICE_ICMP_CODE)
-#define ICE_INSET_ICMP6_TYPE \
- (ICE_PROT_ICMP6_OUTER | ICE_ICMP_TYPE)
-#define ICE_INSET_ICMP6_CODE \
- (ICE_PROT_ICMP6_OUTER | ICE_ICMP_CODE)
+#define ICE_INSET_NONE 0ULL
+
+#define ICE_INSET_SMAC (ICE_SMAC)
+#define ICE_INSET_DMAC (ICE_DMAC)
+#define ICE_INSET_VLAN (ICE_PROT_VLAN)
+#define ICE_INSET_VLAN_INNER (ICE_PROT_VLAN)
+#define ICE_INSET_VLAN_OUTER (ICE_PROT_VLAN)
+#define ICE_INSET_ETHERTYPE (ICE_ETHERTYPE)
+
+#define ICE_INSET_IPV4_SRC (ICE_PROT_IPV4 | ICE_IP_SRC)
+#define ICE_INSET_IPV4_DST (ICE_PROT_IPV4 | ICE_IP_DST)
+#define ICE_INSET_IPV4_TOS (ICE_PROT_IPV4 | ICE_IP_TOS)
+#define ICE_INSET_IPV4_PROTO (ICE_PROT_IPV4 | ICE_IP_PROTO)
+#define ICE_INSET_IPV4_TTL (ICE_PROT_IPV4 | ICE_IP_TTL)
+#define ICE_INSET_IPV4_PKID (ICE_PROT_IPV4 | ICE_IP_PK_ID)
+#define ICE_INSET_IPV6_SRC (ICE_PROT_IPV6 | ICE_IP_SRC)
+#define ICE_INSET_IPV6_DST (ICE_PROT_IPV6 | ICE_IP_DST)
+#define ICE_INSET_IPV6_NEXT_HDR (ICE_PROT_IPV6 | ICE_IP_PROTO)
+#define ICE_INSET_IPV6_HOP_LIMIT (ICE_PROT_IPV6 | ICE_IP_TTL)
+#define ICE_INSET_IPV6_TC (ICE_PROT_IPV6 | ICE_IP_TOS)
+#define ICE_INSET_IPV6_PKID (ICE_PROT_IPV6 | ICE_IP_PK_ID)
+
+#define ICE_INSET_TCP_SRC_PORT (ICE_PROT_TCP | ICE_SPORT)
+#define ICE_INSET_TCP_DST_PORT (ICE_PROT_TCP | ICE_DPORT)
+#define ICE_INSET_UDP_SRC_PORT (ICE_PROT_UDP | ICE_SPORT)
+#define ICE_INSET_UDP_DST_PORT (ICE_PROT_UDP | ICE_DPORT)
+#define ICE_INSET_SCTP_SRC_PORT (ICE_PROT_SCTP | ICE_SPORT)
+#define ICE_INSET_SCTP_DST_PORT (ICE_PROT_SCTP | ICE_DPORT)
+#define ICE_INSET_ICMP4_SRC_PORT (ICE_PROT_ICMP4 | ICE_SPORT)
+#define ICE_INSET_ICMP4_DST_PORT (ICE_PROT_ICMP4 | ICE_DPORT)
+#define ICE_INSET_ICMP6_SRC_PORT (ICE_PROT_ICMP6 | ICE_SPORT)
+#define ICE_INSET_ICMP6_DST_PORT (ICE_PROT_ICMP6 | ICE_DPORT)
+#define ICE_INSET_ICMP4_TYPE (ICE_PROT_ICMP4 | ICE_ICMP_TYPE)
+#define ICE_INSET_ICMP4_CODE (ICE_PROT_ICMP4 | ICE_ICMP_CODE)
+#define ICE_INSET_ICMP6_TYPE (ICE_PROT_ICMP6 | ICE_ICMP_TYPE)
+#define ICE_INSET_ICMP6_CODE (ICE_PROT_ICMP6 | ICE_ICMP_CODE)