net/ice/base: modify recursive way of adding nodes

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

diff --git a/drivers/net/ice/base/ice_fdir.h b/drivers/net/ice/base/ice_fdir.h
index 1f31deb..1c8de89 100644 (file)
--- a/drivers/net/ice/base/ice_fdir.h
+++ b/drivers/net/ice/base/ice_fdir.h
@@ -17,7 +17,6 @@
 #define ICE_FDIR_TUN_PKT_OFF           50
 #define ICE_FDIR_MAX_RAW_PKT_SIZE      (512 + ICE_FDIR_TUN_PKT_OFF)
 #define ICE_FDIR_BUF_FULL_MARGIN       10
-#define ICE_FDIR_BUF_HEAD_ROOM         32
 
 /* macros for offsets into packets for flow director programming */
 #define ICE_IPV4_SRC_ADDR_OFFSET       26
@@ -56,6 +55,7 @@
 #define ICE_IPV6_AH_SPI_OFFSET         58
 #define ICE_IPV4_NAT_T_ESP_SPI_OFFSET  42
 #define ICE_IPV6_NAT_T_ESP_SPI_OFFSET  62
+#define ICE_IPV4_VXLAN_VNI_OFFSET      45
 
 #define ICE_FDIR_MAX_FLTRS             16384
 
@@ -164,8 +164,13 @@ struct ice_fdir_l2tpv3 {
        __be32 session_id;
 };
 
+struct ice_fdir_udp_vxlan {
+       __be32 vni; /* 8 bits reserved, always be zero */
+};
+
 struct ice_fdir_extra {
        u8 dst_mac[ETH_ALEN];   /* dest MAC address */
+       u8 src_mac[ETH_ALEN];   /* src MAC address */
        __be16 ether_type;      /* for NON_IP_L2 */
        u32 usr_def[2];         /* user data */
        __be16 vlan_type;       /* VLAN ethertype */
@@ -181,6 +186,18 @@ struct ice_fdir_fltr {
                struct ice_fdir_v6 v6;
        } ip, mask;
 
+       /* for tunnel outer part */
+       union {
+               struct ice_fdir_v4 v4;
+               struct ice_fdir_v6 v6;
+       } ip_outer, mask_outer;
+
+       struct ice_fdir_extra ext_data_outer;
+       struct ice_fdir_extra ext_mask_outer;
+
+       struct ice_fdir_udp_vxlan vxlan_data;
+       struct ice_fdir_udp_vxlan vxlan_mask;
+
        struct ice_fdir_udp_gtp gtpu_data;
        struct ice_fdir_udp_gtp gtpu_mask;
 
@@ -222,7 +239,6 @@ struct ice_fdir_base_pkt {
 
 enum ice_status ice_alloc_fd_res_cntr(struct ice_hw *hw, u16 *cntr_id);
 enum ice_status ice_free_fd_res_cntr(struct ice_hw *hw, u16 cntr_id);
-void ice_set_dflt_val_fd_desc(struct ice_fd_fltr_desc_ctx *fd_fltr_ctx);
 enum ice_status
 ice_alloc_fd_guar_item(struct ice_hw *hw, u16 *cntr_id, u16 num_fltr);
 enum ice_status
@@ -231,7 +247,6 @@ enum ice_status
 ice_alloc_fd_shrd_item(struct ice_hw *hw, u16 *cntr_id, u16 num_fltr);
 enum ice_status
 ice_free_fd_shrd_item(struct ice_hw *hw, u16 cntr_id, u16 num_fltr);
-enum ice_status ice_clear_vsi_fd_table(struct ice_hw *hw, u16 vsi_num);
 enum ice_status ice_clear_pf_fd_table(struct ice_hw *hw);
 void
 ice_fdir_get_prgm_desc(struct ice_hw *hw, struct ice_fdir_fltr *input,