[PATCH 4/4] staging: fsl-dpaa2/eth: Merge header files
From: Ioana Radulescu
Date: Wed Aug 01 2018 - 12:10:30 EST
File net.h contains definitions that are exclusively used by
the key generator/classification API. Merge its contents with
dpkg.h in order to reduce the number of private headers.
Signed-off-by: Ioana Radulescu <ruxandra.radulescu@xxxxxxx>
---
drivers/staging/fsl-dpaa2/ethernet/dpkg.h | 350 ++++++++++++++++++++++++++++-
drivers/staging/fsl-dpaa2/ethernet/net.h | 357 ------------------------------
2 files changed, 349 insertions(+), 358 deletions(-)
delete mode 100644 drivers/staging/fsl-dpaa2/ethernet/net.h
diff --git a/drivers/staging/fsl-dpaa2/ethernet/dpkg.h b/drivers/staging/fsl-dpaa2/ethernet/dpkg.h
index 099ff02..6de613b1 100644
--- a/drivers/staging/fsl-dpaa2/ethernet/dpkg.h
+++ b/drivers/staging/fsl-dpaa2/ethernet/dpkg.h
@@ -5,7 +5,6 @@
#define __FSL_DPKG_H_
#include <linux/types.h>
-#include "net.h"
/* Data Path Key Generator API
* Contains initialization APIs and runtime APIs for the Key Generator
@@ -58,6 +57,355 @@ struct dpkg_mask {
u8 offset;
};
+/* Protocol fields */
+
+/* Ethernet fields */
+#define NH_FLD_ETH_DA BIT(0)
+#define NH_FLD_ETH_SA BIT(1)
+#define NH_FLD_ETH_LENGTH BIT(2)
+#define NH_FLD_ETH_TYPE BIT(3)
+#define NH_FLD_ETH_FINAL_CKSUM BIT(4)
+#define NH_FLD_ETH_PADDING BIT(5)
+#define NH_FLD_ETH_ALL_FIELDS (BIT(6) - 1)
+
+/* VLAN fields */
+#define NH_FLD_VLAN_VPRI BIT(0)
+#define NH_FLD_VLAN_CFI BIT(1)
+#define NH_FLD_VLAN_VID BIT(2)
+#define NH_FLD_VLAN_LENGTH BIT(3)
+#define NH_FLD_VLAN_TYPE BIT(4)
+#define NH_FLD_VLAN_ALL_FIELDS (BIT(5) - 1)
+
+#define NH_FLD_VLAN_TCI (NH_FLD_VLAN_VPRI | \
+ NH_FLD_VLAN_CFI | \
+ NH_FLD_VLAN_VID)
+
+/* IP (generic) fields */
+#define NH_FLD_IP_VER BIT(0)
+#define NH_FLD_IP_DSCP BIT(2)
+#define NH_FLD_IP_ECN BIT(3)
+#define NH_FLD_IP_PROTO BIT(4)
+#define NH_FLD_IP_SRC BIT(5)
+#define NH_FLD_IP_DST BIT(6)
+#define NH_FLD_IP_TOS_TC BIT(7)
+#define NH_FLD_IP_ID BIT(8)
+#define NH_FLD_IP_ALL_FIELDS (BIT(9) - 1)
+
+/* IPV4 fields */
+#define NH_FLD_IPV4_VER BIT(0)
+#define NH_FLD_IPV4_HDR_LEN BIT(1)
+#define NH_FLD_IPV4_TOS BIT(2)
+#define NH_FLD_IPV4_TOTAL_LEN BIT(3)
+#define NH_FLD_IPV4_ID BIT(4)
+#define NH_FLD_IPV4_FLAG_D BIT(5)
+#define NH_FLD_IPV4_FLAG_M BIT(6)
+#define NH_FLD_IPV4_OFFSET BIT(7)
+#define NH_FLD_IPV4_TTL BIT(8)
+#define NH_FLD_IPV4_PROTO BIT(9)
+#define NH_FLD_IPV4_CKSUM BIT(10)
+#define NH_FLD_IPV4_SRC_IP BIT(11)
+#define NH_FLD_IPV4_DST_IP BIT(12)
+#define NH_FLD_IPV4_OPTS BIT(13)
+#define NH_FLD_IPV4_OPTS_COUNT BIT(14)
+#define NH_FLD_IPV4_ALL_FIELDS (BIT(15) - 1)
+
+/* IPV6 fields */
+#define NH_FLD_IPV6_VER BIT(0)
+#define NH_FLD_IPV6_TC BIT(1)
+#define NH_FLD_IPV6_SRC_IP BIT(2)
+#define NH_FLD_IPV6_DST_IP BIT(3)
+#define NH_FLD_IPV6_NEXT_HDR BIT(4)
+#define NH_FLD_IPV6_FL BIT(5)
+#define NH_FLD_IPV6_HOP_LIMIT BIT(6)
+#define NH_FLD_IPV6_ID BIT(7)
+#define NH_FLD_IPV6_ALL_FIELDS (BIT(8) - 1)
+
+/* ICMP fields */
+#define NH_FLD_ICMP_TYPE BIT(0)
+#define NH_FLD_ICMP_CODE BIT(1)
+#define NH_FLD_ICMP_CKSUM BIT(2)
+#define NH_FLD_ICMP_ID BIT(3)
+#define NH_FLD_ICMP_SQ_NUM BIT(4)
+#define NH_FLD_ICMP_ALL_FIELDS (BIT(5) - 1)
+
+/* IGMP fields */
+#define NH_FLD_IGMP_VERSION BIT(0)
+#define NH_FLD_IGMP_TYPE BIT(1)
+#define NH_FLD_IGMP_CKSUM BIT(2)
+#define NH_FLD_IGMP_DATA BIT(3)
+#define NH_FLD_IGMP_ALL_FIELDS (BIT(4) - 1)
+
+/* TCP fields */
+#define NH_FLD_TCP_PORT_SRC BIT(0)
+#define NH_FLD_TCP_PORT_DST BIT(1)
+#define NH_FLD_TCP_SEQ BIT(2)
+#define NH_FLD_TCP_ACK BIT(3)
+#define NH_FLD_TCP_OFFSET BIT(4)
+#define NH_FLD_TCP_FLAGS BIT(5)
+#define NH_FLD_TCP_WINDOW BIT(6)
+#define NH_FLD_TCP_CKSUM BIT(7)
+#define NH_FLD_TCP_URGPTR BIT(8)
+#define NH_FLD_TCP_OPTS BIT(9)
+#define NH_FLD_TCP_OPTS_COUNT BIT(10)
+#define NH_FLD_TCP_ALL_FIELDS (BIT(11) - 1)
+
+/* UDP fields */
+#define NH_FLD_UDP_PORT_SRC BIT(0)
+#define NH_FLD_UDP_PORT_DST BIT(1)
+#define NH_FLD_UDP_LEN BIT(2)
+#define NH_FLD_UDP_CKSUM BIT(3)
+#define NH_FLD_UDP_ALL_FIELDS (BIT(4) - 1)
+
+/* UDP-lite fields */
+#define NH_FLD_UDP_LITE_PORT_SRC BIT(0)
+#define NH_FLD_UDP_LITE_PORT_DST BIT(1)
+#define NH_FLD_UDP_LITE_ALL_FIELDS (BIT(2) - 1)
+
+/* UDP-encap-ESP fields */
+#define NH_FLD_UDP_ENC_ESP_PORT_SRC BIT(0)
+#define NH_FLD_UDP_ENC_ESP_PORT_DST BIT(1)
+#define NH_FLD_UDP_ENC_ESP_LEN BIT(2)
+#define NH_FLD_UDP_ENC_ESP_CKSUM BIT(3)
+#define NH_FLD_UDP_ENC_ESP_SPI BIT(4)
+#define NH_FLD_UDP_ENC_ESP_SEQUENCE_NUM BIT(5)
+#define NH_FLD_UDP_ENC_ESP_ALL_FIELDS (BIT(6) - 1)
+
+/* SCTP fields */
+#define NH_FLD_SCTP_PORT_SRC BIT(0)
+#define NH_FLD_SCTP_PORT_DST BIT(1)
+#define NH_FLD_SCTP_VER_TAG BIT(2)
+#define NH_FLD_SCTP_CKSUM BIT(3)
+#define NH_FLD_SCTP_ALL_FIELDS (BIT(4) - 1)
+
+/* DCCP fields */
+#define NH_FLD_DCCP_PORT_SRC BIT(0)
+#define NH_FLD_DCCP_PORT_DST BIT(1)
+#define NH_FLD_DCCP_ALL_FIELDS (BIT(2) - 1)
+
+/* IPHC fields */
+#define NH_FLD_IPHC_CID BIT(0)
+#define NH_FLD_IPHC_CID_TYPE BIT(1)
+#define NH_FLD_IPHC_HCINDEX BIT(2)
+#define NH_FLD_IPHC_GEN BIT(3)
+#define NH_FLD_IPHC_D_BIT BIT(4)
+#define NH_FLD_IPHC_ALL_FIELDS (BIT(5) - 1)
+
+/* SCTP fields */
+#define NH_FLD_SCTP_CHUNK_DATA_TYPE BIT(0)
+#define NH_FLD_SCTP_CHUNK_DATA_FLAGS BIT(1)
+#define NH_FLD_SCTP_CHUNK_DATA_LENGTH BIT(2)
+#define NH_FLD_SCTP_CHUNK_DATA_TSN BIT(3)
+#define NH_FLD_SCTP_CHUNK_DATA_STREAM_ID BIT(4)
+#define NH_FLD_SCTP_CHUNK_DATA_STREAM_SQN BIT(5)
+#define NH_FLD_SCTP_CHUNK_DATA_PAYLOAD_PID BIT(6)
+#define NH_FLD_SCTP_CHUNK_DATA_UNORDERED BIT(7)
+#define NH_FLD_SCTP_CHUNK_DATA_BEGGINING BIT(8)
+#define NH_FLD_SCTP_CHUNK_DATA_END BIT(9)
+#define NH_FLD_SCTP_CHUNK_DATA_ALL_FIELDS (BIT(10) - 1)
+
+/* L2TPV2 fields */
+#define NH_FLD_L2TPV2_TYPE_BIT BIT(0)
+#define NH_FLD_L2TPV2_LENGTH_BIT BIT(1)
+#define NH_FLD_L2TPV2_SEQUENCE_BIT BIT(2)
+#define NH_FLD_L2TPV2_OFFSET_BIT BIT(3)
+#define NH_FLD_L2TPV2_PRIORITY_BIT BIT(4)
+#define NH_FLD_L2TPV2_VERSION BIT(5)
+#define NH_FLD_L2TPV2_LEN BIT(6)
+#define NH_FLD_L2TPV2_TUNNEL_ID BIT(7)
+#define NH_FLD_L2TPV2_SESSION_ID BIT(8)
+#define NH_FLD_L2TPV2_NS BIT(9)
+#define NH_FLD_L2TPV2_NR BIT(10)
+#define NH_FLD_L2TPV2_OFFSET_SIZE BIT(11)
+#define NH_FLD_L2TPV2_FIRST_BYTE BIT(12)
+#define NH_FLD_L2TPV2_ALL_FIELDS (BIT(13) - 1)
+
+/* L2TPV3 fields */
+#define NH_FLD_L2TPV3_CTRL_TYPE_BIT BIT(0)
+#define NH_FLD_L2TPV3_CTRL_LENGTH_BIT BIT(1)
+#define NH_FLD_L2TPV3_CTRL_SEQUENCE_BIT BIT(2)
+#define NH_FLD_L2TPV3_CTRL_VERSION BIT(3)
+#define NH_FLD_L2TPV3_CTRL_LENGTH BIT(4)
+#define NH_FLD_L2TPV3_CTRL_CONTROL BIT(5)
+#define NH_FLD_L2TPV3_CTRL_SENT BIT(6)
+#define NH_FLD_L2TPV3_CTRL_RECV BIT(7)
+#define NH_FLD_L2TPV3_CTRL_FIRST_BYTE BIT(8)
+#define NH_FLD_L2TPV3_CTRL_ALL_FIELDS (BIT(9) - 1)
+
+#define NH_FLD_L2TPV3_SESS_TYPE_BIT BIT(0)
+#define NH_FLD_L2TPV3_SESS_VERSION BIT(1)
+#define NH_FLD_L2TPV3_SESS_ID BIT(2)
+#define NH_FLD_L2TPV3_SESS_COOKIE BIT(3)
+#define NH_FLD_L2TPV3_SESS_ALL_FIELDS (BIT(4) - 1)
+
+/* PPP fields */
+#define NH_FLD_PPP_PID BIT(0)
+#define NH_FLD_PPP_COMPRESSED BIT(1)
+#define NH_FLD_PPP_ALL_FIELDS (BIT(2) - 1)
+
+/* PPPoE fields */
+#define NH_FLD_PPPOE_VER BIT(0)
+#define NH_FLD_PPPOE_TYPE BIT(1)
+#define NH_FLD_PPPOE_CODE BIT(2)
+#define NH_FLD_PPPOE_SID BIT(3)
+#define NH_FLD_PPPOE_LEN BIT(4)
+#define NH_FLD_PPPOE_SESSION BIT(5)
+#define NH_FLD_PPPOE_PID BIT(6)
+#define NH_FLD_PPPOE_ALL_FIELDS (BIT(7) - 1)
+
+/* PPP-Mux fields */
+#define NH_FLD_PPPMUX_PID BIT(0)
+#define NH_FLD_PPPMUX_CKSUM BIT(1)
+#define NH_FLD_PPPMUX_COMPRESSED BIT(2)
+#define NH_FLD_PPPMUX_ALL_FIELDS (BIT(3) - 1)
+
+/* PPP-Mux sub-frame fields */
+#define NH_FLD_PPPMUX_SUBFRM_PFF BIT(0)
+#define NH_FLD_PPPMUX_SUBFRM_LXT BIT(1)
+#define NH_FLD_PPPMUX_SUBFRM_LEN BIT(2)
+#define NH_FLD_PPPMUX_SUBFRM_PID BIT(3)
+#define NH_FLD_PPPMUX_SUBFRM_USE_PID BIT(4)
+#define NH_FLD_PPPMUX_SUBFRM_ALL_FIELDS (BIT(5) - 1)
+
+/* LLC fields */
+#define NH_FLD_LLC_DSAP BIT(0)
+#define NH_FLD_LLC_SSAP BIT(1)
+#define NH_FLD_LLC_CTRL BIT(2)
+#define NH_FLD_LLC_ALL_FIELDS (BIT(3) - 1)
+
+/* NLPID fields */
+#define NH_FLD_NLPID_NLPID BIT(0)
+#define NH_FLD_NLPID_ALL_FIELDS (BIT(1) - 1)
+
+/* SNAP fields */
+#define NH_FLD_SNAP_OUI BIT(0)
+#define NH_FLD_SNAP_PID BIT(1)
+#define NH_FLD_SNAP_ALL_FIELDS (BIT(2) - 1)
+
+/* LLC SNAP fields */
+#define NH_FLD_LLC_SNAP_TYPE BIT(0)
+#define NH_FLD_LLC_SNAP_ALL_FIELDS (BIT(1) - 1)
+
+/* ARP fields */
+#define NH_FLD_ARP_HTYPE BIT(0)
+#define NH_FLD_ARP_PTYPE BIT(1)
+#define NH_FLD_ARP_HLEN BIT(2)
+#define NH_FLD_ARP_PLEN BIT(3)
+#define NH_FLD_ARP_OPER BIT(4)
+#define NH_FLD_ARP_SHA BIT(5)
+#define NH_FLD_ARP_SPA BIT(6)
+#define NH_FLD_ARP_THA BIT(7)
+#define NH_FLD_ARP_TPA BIT(8)
+#define NH_FLD_ARP_ALL_FIELDS (BIT(9) - 1)
+
+/* RFC2684 fields */
+#define NH_FLD_RFC2684_LLC BIT(0)
+#define NH_FLD_RFC2684_NLPID BIT(1)
+#define NH_FLD_RFC2684_OUI BIT(2)
+#define NH_FLD_RFC2684_PID BIT(3)
+#define NH_FLD_RFC2684_VPN_OUI BIT(4)
+#define NH_FLD_RFC2684_VPN_IDX BIT(5)
+#define NH_FLD_RFC2684_ALL_FIELDS (BIT(6) - 1)
+
+/* User defined fields */
+#define NH_FLD_USER_DEFINED_SRCPORT BIT(0)
+#define NH_FLD_USER_DEFINED_PCDID BIT(1)
+#define NH_FLD_USER_DEFINED_ALL_FIELDS (BIT(2) - 1)
+
+/* Payload fields */
+#define NH_FLD_PAYLOAD_BUFFER BIT(0)
+#define NH_FLD_PAYLOAD_SIZE BIT(1)
+#define NH_FLD_MAX_FRM_SIZE BIT(2)
+#define NH_FLD_MIN_FRM_SIZE BIT(3)
+#define NH_FLD_PAYLOAD_TYPE BIT(4)
+#define NH_FLD_FRAME_SIZE BIT(5)
+#define NH_FLD_PAYLOAD_ALL_FIELDS (BIT(6) - 1)
+
+/* GRE fields */
+#define NH_FLD_GRE_TYPE BIT(0)
+#define NH_FLD_GRE_ALL_FIELDS (BIT(1) - 1)
+
+/* MINENCAP fields */
+#define NH_FLD_MINENCAP_SRC_IP BIT(0)
+#define NH_FLD_MINENCAP_DST_IP BIT(1)
+#define NH_FLD_MINENCAP_TYPE BIT(2)
+#define NH_FLD_MINENCAP_ALL_FIELDS (BIT(3) - 1)
+
+/* IPSEC AH fields */
+#define NH_FLD_IPSEC_AH_SPI BIT(0)
+#define NH_FLD_IPSEC_AH_NH BIT(1)
+#define NH_FLD_IPSEC_AH_ALL_FIELDS (BIT(2) - 1)
+
+/* IPSEC ESP fields */
+#define NH_FLD_IPSEC_ESP_SPI BIT(0)
+#define NH_FLD_IPSEC_ESP_SEQUENCE_NUM BIT(1)
+#define NH_FLD_IPSEC_ESP_ALL_FIELDS (BIT(2) - 1)
+
+/* MPLS fields */
+#define NH_FLD_MPLS_LABEL_STACK BIT(0)
+#define NH_FLD_MPLS_LABEL_STACK_ALL_FIELDS (BIT(1) - 1)
+
+/* MACSEC fields */
+#define NH_FLD_MACSEC_SECTAG BIT(0)
+#define NH_FLD_MACSEC_ALL_FIELDS (BIT(1) - 1)
+
+/* GTP fields */
+#define NH_FLD_GTP_TEID BIT(0)
+
+/* Supported protocols */
+enum net_prot {
+ NET_PROT_NONE = 0,
+ NET_PROT_PAYLOAD,
+ NET_PROT_ETH,
+ NET_PROT_VLAN,
+ NET_PROT_IPV4,
+ NET_PROT_IPV6,
+ NET_PROT_IP,
+ NET_PROT_TCP,
+ NET_PROT_UDP,
+ NET_PROT_UDP_LITE,
+ NET_PROT_IPHC,
+ NET_PROT_SCTP,
+ NET_PROT_SCTP_CHUNK_DATA,
+ NET_PROT_PPPOE,
+ NET_PROT_PPP,
+ NET_PROT_PPPMUX,
+ NET_PROT_PPPMUX_SUBFRM,
+ NET_PROT_L2TPV2,
+ NET_PROT_L2TPV3_CTRL,
+ NET_PROT_L2TPV3_SESS,
+ NET_PROT_LLC,
+ NET_PROT_LLC_SNAP,
+ NET_PROT_NLPID,
+ NET_PROT_SNAP,
+ NET_PROT_MPLS,
+ NET_PROT_IPSEC_AH,
+ NET_PROT_IPSEC_ESP,
+ NET_PROT_UDP_ENC_ESP, /* RFC 3948 */
+ NET_PROT_MACSEC,
+ NET_PROT_GRE,
+ NET_PROT_MINENCAP,
+ NET_PROT_DCCP,
+ NET_PROT_ICMP,
+ NET_PROT_IGMP,
+ NET_PROT_ARP,
+ NET_PROT_CAPWAP_DATA,
+ NET_PROT_CAPWAP_CTRL,
+ NET_PROT_RFC2684,
+ NET_PROT_ICMPV6,
+ NET_PROT_FCOE,
+ NET_PROT_FIP,
+ NET_PROT_ISCSI,
+ NET_PROT_GTP,
+ NET_PROT_USER_DEFINED_L2,
+ NET_PROT_USER_DEFINED_L3,
+ NET_PROT_USER_DEFINED_L4,
+ NET_PROT_USER_DEFINED_L5,
+ NET_PROT_USER_DEFINED_SHIM1,
+ NET_PROT_USER_DEFINED_SHIM2,
+
+ NET_PROT_DUMMY_LAST
+};
+
/**
* struct dpkg_extract - A structure for defining a single extraction
* @type: Determines how the union below is interpreted:
diff --git a/drivers/staging/fsl-dpaa2/ethernet/net.h b/drivers/staging/fsl-dpaa2/ethernet/net.h
deleted file mode 100644
index 81f5a91..0000000
--- a/drivers/staging/fsl-dpaa2/ethernet/net.h
+++ /dev/null
@@ -1,357 +0,0 @@
-/* SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) */
-/* Copyright 2013-2015 Freescale Semiconductor Inc.
- */
-#ifndef __FSL_NET_H
-#define __FSL_NET_H
-
-/* Protocol fields */
-
-/* Ethernet fields */
-#define NH_FLD_ETH_DA BIT(0)
-#define NH_FLD_ETH_SA BIT(1)
-#define NH_FLD_ETH_LENGTH BIT(2)
-#define NH_FLD_ETH_TYPE BIT(3)
-#define NH_FLD_ETH_FINAL_CKSUM BIT(4)
-#define NH_FLD_ETH_PADDING BIT(5)
-#define NH_FLD_ETH_ALL_FIELDS (BIT(6) - 1)
-
-/* VLAN fields */
-#define NH_FLD_VLAN_VPRI BIT(0)
-#define NH_FLD_VLAN_CFI BIT(1)
-#define NH_FLD_VLAN_VID BIT(2)
-#define NH_FLD_VLAN_LENGTH BIT(3)
-#define NH_FLD_VLAN_TYPE BIT(4)
-#define NH_FLD_VLAN_ALL_FIELDS (BIT(5) - 1)
-
-#define NH_FLD_VLAN_TCI (NH_FLD_VLAN_VPRI | \
- NH_FLD_VLAN_CFI | \
- NH_FLD_VLAN_VID)
-
-/* IP (generic) fields */
-#define NH_FLD_IP_VER BIT(0)
-#define NH_FLD_IP_DSCP BIT(2)
-#define NH_FLD_IP_ECN BIT(3)
-#define NH_FLD_IP_PROTO BIT(4)
-#define NH_FLD_IP_SRC BIT(5)
-#define NH_FLD_IP_DST BIT(6)
-#define NH_FLD_IP_TOS_TC BIT(7)
-#define NH_FLD_IP_ID BIT(8)
-#define NH_FLD_IP_ALL_FIELDS (BIT(9) - 1)
-
-/* IPV4 fields */
-#define NH_FLD_IPV4_VER BIT(0)
-#define NH_FLD_IPV4_HDR_LEN BIT(1)
-#define NH_FLD_IPV4_TOS BIT(2)
-#define NH_FLD_IPV4_TOTAL_LEN BIT(3)
-#define NH_FLD_IPV4_ID BIT(4)
-#define NH_FLD_IPV4_FLAG_D BIT(5)
-#define NH_FLD_IPV4_FLAG_M BIT(6)
-#define NH_FLD_IPV4_OFFSET BIT(7)
-#define NH_FLD_IPV4_TTL BIT(8)
-#define NH_FLD_IPV4_PROTO BIT(9)
-#define NH_FLD_IPV4_CKSUM BIT(10)
-#define NH_FLD_IPV4_SRC_IP BIT(11)
-#define NH_FLD_IPV4_DST_IP BIT(12)
-#define NH_FLD_IPV4_OPTS BIT(13)
-#define NH_FLD_IPV4_OPTS_COUNT BIT(14)
-#define NH_FLD_IPV4_ALL_FIELDS (BIT(15) - 1)
-
-/* IPV6 fields */
-#define NH_FLD_IPV6_VER BIT(0)
-#define NH_FLD_IPV6_TC BIT(1)
-#define NH_FLD_IPV6_SRC_IP BIT(2)
-#define NH_FLD_IPV6_DST_IP BIT(3)
-#define NH_FLD_IPV6_NEXT_HDR BIT(4)
-#define NH_FLD_IPV6_FL BIT(5)
-#define NH_FLD_IPV6_HOP_LIMIT BIT(6)
-#define NH_FLD_IPV6_ID BIT(7)
-#define NH_FLD_IPV6_ALL_FIELDS (BIT(8) - 1)
-
-/* ICMP fields */
-#define NH_FLD_ICMP_TYPE BIT(0)
-#define NH_FLD_ICMP_CODE BIT(1)
-#define NH_FLD_ICMP_CKSUM BIT(2)
-#define NH_FLD_ICMP_ID BIT(3)
-#define NH_FLD_ICMP_SQ_NUM BIT(4)
-#define NH_FLD_ICMP_ALL_FIELDS (BIT(5) - 1)
-
-/* IGMP fields */
-#define NH_FLD_IGMP_VERSION BIT(0)
-#define NH_FLD_IGMP_TYPE BIT(1)
-#define NH_FLD_IGMP_CKSUM BIT(2)
-#define NH_FLD_IGMP_DATA BIT(3)
-#define NH_FLD_IGMP_ALL_FIELDS (BIT(4) - 1)
-
-/* TCP fields */
-#define NH_FLD_TCP_PORT_SRC BIT(0)
-#define NH_FLD_TCP_PORT_DST BIT(1)
-#define NH_FLD_TCP_SEQ BIT(2)
-#define NH_FLD_TCP_ACK BIT(3)
-#define NH_FLD_TCP_OFFSET BIT(4)
-#define NH_FLD_TCP_FLAGS BIT(5)
-#define NH_FLD_TCP_WINDOW BIT(6)
-#define NH_FLD_TCP_CKSUM BIT(7)
-#define NH_FLD_TCP_URGPTR BIT(8)
-#define NH_FLD_TCP_OPTS BIT(9)
-#define NH_FLD_TCP_OPTS_COUNT BIT(10)
-#define NH_FLD_TCP_ALL_FIELDS (BIT(11) - 1)
-
-/* UDP fields */
-#define NH_FLD_UDP_PORT_SRC BIT(0)
-#define NH_FLD_UDP_PORT_DST BIT(1)
-#define NH_FLD_UDP_LEN BIT(2)
-#define NH_FLD_UDP_CKSUM BIT(3)
-#define NH_FLD_UDP_ALL_FIELDS (BIT(4) - 1)
-
-/* UDP-lite fields */
-#define NH_FLD_UDP_LITE_PORT_SRC BIT(0)
-#define NH_FLD_UDP_LITE_PORT_DST BIT(1)
-#define NH_FLD_UDP_LITE_ALL_FIELDS (BIT(2) - 1)
-
-/* UDP-encap-ESP fields */
-#define NH_FLD_UDP_ENC_ESP_PORT_SRC BIT(0)
-#define NH_FLD_UDP_ENC_ESP_PORT_DST BIT(1)
-#define NH_FLD_UDP_ENC_ESP_LEN BIT(2)
-#define NH_FLD_UDP_ENC_ESP_CKSUM BIT(3)
-#define NH_FLD_UDP_ENC_ESP_SPI BIT(4)
-#define NH_FLD_UDP_ENC_ESP_SEQUENCE_NUM BIT(5)
-#define NH_FLD_UDP_ENC_ESP_ALL_FIELDS (BIT(6) - 1)
-
-/* SCTP fields */
-#define NH_FLD_SCTP_PORT_SRC BIT(0)
-#define NH_FLD_SCTP_PORT_DST BIT(1)
-#define NH_FLD_SCTP_VER_TAG BIT(2)
-#define NH_FLD_SCTP_CKSUM BIT(3)
-#define NH_FLD_SCTP_ALL_FIELDS (BIT(4) - 1)
-
-/* DCCP fields */
-#define NH_FLD_DCCP_PORT_SRC BIT(0)
-#define NH_FLD_DCCP_PORT_DST BIT(1)
-#define NH_FLD_DCCP_ALL_FIELDS (BIT(2) - 1)
-
-/* IPHC fields */
-#define NH_FLD_IPHC_CID BIT(0)
-#define NH_FLD_IPHC_CID_TYPE BIT(1)
-#define NH_FLD_IPHC_HCINDEX BIT(2)
-#define NH_FLD_IPHC_GEN BIT(3)
-#define NH_FLD_IPHC_D_BIT BIT(4)
-#define NH_FLD_IPHC_ALL_FIELDS (BIT(5) - 1)
-
-/* SCTP fields */
-#define NH_FLD_SCTP_CHUNK_DATA_TYPE BIT(0)
-#define NH_FLD_SCTP_CHUNK_DATA_FLAGS BIT(1)
-#define NH_FLD_SCTP_CHUNK_DATA_LENGTH BIT(2)
-#define NH_FLD_SCTP_CHUNK_DATA_TSN BIT(3)
-#define NH_FLD_SCTP_CHUNK_DATA_STREAM_ID BIT(4)
-#define NH_FLD_SCTP_CHUNK_DATA_STREAM_SQN BIT(5)
-#define NH_FLD_SCTP_CHUNK_DATA_PAYLOAD_PID BIT(6)
-#define NH_FLD_SCTP_CHUNK_DATA_UNORDERED BIT(7)
-#define NH_FLD_SCTP_CHUNK_DATA_BEGGINING BIT(8)
-#define NH_FLD_SCTP_CHUNK_DATA_END BIT(9)
-#define NH_FLD_SCTP_CHUNK_DATA_ALL_FIELDS (BIT(10) - 1)
-
-/* L2TPV2 fields */
-#define NH_FLD_L2TPV2_TYPE_BIT BIT(0)
-#define NH_FLD_L2TPV2_LENGTH_BIT BIT(1)
-#define NH_FLD_L2TPV2_SEQUENCE_BIT BIT(2)
-#define NH_FLD_L2TPV2_OFFSET_BIT BIT(3)
-#define NH_FLD_L2TPV2_PRIORITY_BIT BIT(4)
-#define NH_FLD_L2TPV2_VERSION BIT(5)
-#define NH_FLD_L2TPV2_LEN BIT(6)
-#define NH_FLD_L2TPV2_TUNNEL_ID BIT(7)
-#define NH_FLD_L2TPV2_SESSION_ID BIT(8)
-#define NH_FLD_L2TPV2_NS BIT(9)
-#define NH_FLD_L2TPV2_NR BIT(10)
-#define NH_FLD_L2TPV2_OFFSET_SIZE BIT(11)
-#define NH_FLD_L2TPV2_FIRST_BYTE BIT(12)
-#define NH_FLD_L2TPV2_ALL_FIELDS (BIT(13) - 1)
-
-/* L2TPV3 fields */
-#define NH_FLD_L2TPV3_CTRL_TYPE_BIT BIT(0)
-#define NH_FLD_L2TPV3_CTRL_LENGTH_BIT BIT(1)
-#define NH_FLD_L2TPV3_CTRL_SEQUENCE_BIT BIT(2)
-#define NH_FLD_L2TPV3_CTRL_VERSION BIT(3)
-#define NH_FLD_L2TPV3_CTRL_LENGTH BIT(4)
-#define NH_FLD_L2TPV3_CTRL_CONTROL BIT(5)
-#define NH_FLD_L2TPV3_CTRL_SENT BIT(6)
-#define NH_FLD_L2TPV3_CTRL_RECV BIT(7)
-#define NH_FLD_L2TPV3_CTRL_FIRST_BYTE BIT(8)
-#define NH_FLD_L2TPV3_CTRL_ALL_FIELDS (BIT(9) - 1)
-
-#define NH_FLD_L2TPV3_SESS_TYPE_BIT BIT(0)
-#define NH_FLD_L2TPV3_SESS_VERSION BIT(1)
-#define NH_FLD_L2TPV3_SESS_ID BIT(2)
-#define NH_FLD_L2TPV3_SESS_COOKIE BIT(3)
-#define NH_FLD_L2TPV3_SESS_ALL_FIELDS (BIT(4) - 1)
-
-/* PPP fields */
-#define NH_FLD_PPP_PID BIT(0)
-#define NH_FLD_PPP_COMPRESSED BIT(1)
-#define NH_FLD_PPP_ALL_FIELDS (BIT(2) - 1)
-
-/* PPPoE fields */
-#define NH_FLD_PPPOE_VER BIT(0)
-#define NH_FLD_PPPOE_TYPE BIT(1)
-#define NH_FLD_PPPOE_CODE BIT(2)
-#define NH_FLD_PPPOE_SID BIT(3)
-#define NH_FLD_PPPOE_LEN BIT(4)
-#define NH_FLD_PPPOE_SESSION BIT(5)
-#define NH_FLD_PPPOE_PID BIT(6)
-#define NH_FLD_PPPOE_ALL_FIELDS (BIT(7) - 1)
-
-/* PPP-Mux fields */
-#define NH_FLD_PPPMUX_PID BIT(0)
-#define NH_FLD_PPPMUX_CKSUM BIT(1)
-#define NH_FLD_PPPMUX_COMPRESSED BIT(2)
-#define NH_FLD_PPPMUX_ALL_FIELDS (BIT(3) - 1)
-
-/* PPP-Mux sub-frame fields */
-#define NH_FLD_PPPMUX_SUBFRM_PFF BIT(0)
-#define NH_FLD_PPPMUX_SUBFRM_LXT BIT(1)
-#define NH_FLD_PPPMUX_SUBFRM_LEN BIT(2)
-#define NH_FLD_PPPMUX_SUBFRM_PID BIT(3)
-#define NH_FLD_PPPMUX_SUBFRM_USE_PID BIT(4)
-#define NH_FLD_PPPMUX_SUBFRM_ALL_FIELDS (BIT(5) - 1)
-
-/* LLC fields */
-#define NH_FLD_LLC_DSAP BIT(0)
-#define NH_FLD_LLC_SSAP BIT(1)
-#define NH_FLD_LLC_CTRL BIT(2)
-#define NH_FLD_LLC_ALL_FIELDS (BIT(3) - 1)
-
-/* NLPID fields */
-#define NH_FLD_NLPID_NLPID BIT(0)
-#define NH_FLD_NLPID_ALL_FIELDS (BIT(1) - 1)
-
-/* SNAP fields */
-#define NH_FLD_SNAP_OUI BIT(0)
-#define NH_FLD_SNAP_PID BIT(1)
-#define NH_FLD_SNAP_ALL_FIELDS (BIT(2) - 1)
-
-/* LLC SNAP fields */
-#define NH_FLD_LLC_SNAP_TYPE BIT(0)
-#define NH_FLD_LLC_SNAP_ALL_FIELDS (BIT(1) - 1)
-
-/* ARP fields */
-#define NH_FLD_ARP_HTYPE BIT(0)
-#define NH_FLD_ARP_PTYPE BIT(1)
-#define NH_FLD_ARP_HLEN BIT(2)
-#define NH_FLD_ARP_PLEN BIT(3)
-#define NH_FLD_ARP_OPER BIT(4)
-#define NH_FLD_ARP_SHA BIT(5)
-#define NH_FLD_ARP_SPA BIT(6)
-#define NH_FLD_ARP_THA BIT(7)
-#define NH_FLD_ARP_TPA BIT(8)
-#define NH_FLD_ARP_ALL_FIELDS (BIT(9) - 1)
-
-/* RFC2684 fields */
-#define NH_FLD_RFC2684_LLC BIT(0)
-#define NH_FLD_RFC2684_NLPID BIT(1)
-#define NH_FLD_RFC2684_OUI BIT(2)
-#define NH_FLD_RFC2684_PID BIT(3)
-#define NH_FLD_RFC2684_VPN_OUI BIT(4)
-#define NH_FLD_RFC2684_VPN_IDX BIT(5)
-#define NH_FLD_RFC2684_ALL_FIELDS (BIT(6) - 1)
-
-/* User defined fields */
-#define NH_FLD_USER_DEFINED_SRCPORT BIT(0)
-#define NH_FLD_USER_DEFINED_PCDID BIT(1)
-#define NH_FLD_USER_DEFINED_ALL_FIELDS (BIT(2) - 1)
-
-/* Payload fields */
-#define NH_FLD_PAYLOAD_BUFFER BIT(0)
-#define NH_FLD_PAYLOAD_SIZE BIT(1)
-#define NH_FLD_MAX_FRM_SIZE BIT(2)
-#define NH_FLD_MIN_FRM_SIZE BIT(3)
-#define NH_FLD_PAYLOAD_TYPE BIT(4)
-#define NH_FLD_FRAME_SIZE BIT(5)
-#define NH_FLD_PAYLOAD_ALL_FIELDS (BIT(6) - 1)
-
-/* GRE fields */
-#define NH_FLD_GRE_TYPE BIT(0)
-#define NH_FLD_GRE_ALL_FIELDS (BIT(1) - 1)
-
-/* MINENCAP fields */
-#define NH_FLD_MINENCAP_SRC_IP BIT(0)
-#define NH_FLD_MINENCAP_DST_IP BIT(1)
-#define NH_FLD_MINENCAP_TYPE BIT(2)
-#define NH_FLD_MINENCAP_ALL_FIELDS (BIT(3) - 1)
-
-/* IPSEC AH fields */
-#define NH_FLD_IPSEC_AH_SPI BIT(0)
-#define NH_FLD_IPSEC_AH_NH BIT(1)
-#define NH_FLD_IPSEC_AH_ALL_FIELDS (BIT(2) - 1)
-
-/* IPSEC ESP fields */
-#define NH_FLD_IPSEC_ESP_SPI BIT(0)
-#define NH_FLD_IPSEC_ESP_SEQUENCE_NUM BIT(1)
-#define NH_FLD_IPSEC_ESP_ALL_FIELDS (BIT(2) - 1)
-
-
-/* MPLS fields */
-#define NH_FLD_MPLS_LABEL_STACK BIT(0)
-#define NH_FLD_MPLS_LABEL_STACK_ALL_FIELDS (BIT(1) - 1)
-
-/* MACSEC fields */
-#define NH_FLD_MACSEC_SECTAG BIT(0)
-#define NH_FLD_MACSEC_ALL_FIELDS (BIT(1) - 1)
-
-/* GTP fields */
-#define NH_FLD_GTP_TEID BIT(0)
-
-/* Supported protocols */
-enum net_prot {
- NET_PROT_NONE = 0,
- NET_PROT_PAYLOAD,
- NET_PROT_ETH,
- NET_PROT_VLAN,
- NET_PROT_IPV4,
- NET_PROT_IPV6,
- NET_PROT_IP,
- NET_PROT_TCP,
- NET_PROT_UDP,
- NET_PROT_UDP_LITE,
- NET_PROT_IPHC,
- NET_PROT_SCTP,
- NET_PROT_SCTP_CHUNK_DATA,
- NET_PROT_PPPOE,
- NET_PROT_PPP,
- NET_PROT_PPPMUX,
- NET_PROT_PPPMUX_SUBFRM,
- NET_PROT_L2TPV2,
- NET_PROT_L2TPV3_CTRL,
- NET_PROT_L2TPV3_SESS,
- NET_PROT_LLC,
- NET_PROT_LLC_SNAP,
- NET_PROT_NLPID,
- NET_PROT_SNAP,
- NET_PROT_MPLS,
- NET_PROT_IPSEC_AH,
- NET_PROT_IPSEC_ESP,
- NET_PROT_UDP_ENC_ESP, /* RFC 3948 */
- NET_PROT_MACSEC,
- NET_PROT_GRE,
- NET_PROT_MINENCAP,
- NET_PROT_DCCP,
- NET_PROT_ICMP,
- NET_PROT_IGMP,
- NET_PROT_ARP,
- NET_PROT_CAPWAP_DATA,
- NET_PROT_CAPWAP_CTRL,
- NET_PROT_RFC2684,
- NET_PROT_ICMPV6,
- NET_PROT_FCOE,
- NET_PROT_FIP,
- NET_PROT_ISCSI,
- NET_PROT_GTP,
- NET_PROT_USER_DEFINED_L2,
- NET_PROT_USER_DEFINED_L3,
- NET_PROT_USER_DEFINED_L4,
- NET_PROT_USER_DEFINED_L5,
- NET_PROT_USER_DEFINED_SHIM1,
- NET_PROT_USER_DEFINED_SHIM2,
-
- NET_PROT_DUMMY_LAST
-};
-
-#endif /* __FSL_NET_H */
--
2.7.4