net/ice/base: fix bitmap set function

[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 b39ce0b..7e00bb2 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
@@ -46,6 +45,16 @@
 #define ICE_IPV6_PROTO_OFFSET          20
 #define ICE_IPV4_GTPU_TEID_OFFSET      46
 #define ICE_IPV4_GTPU_QFI_OFFSET       56
+#define ICE_IPV6_GTPU_TEID_OFFSET      66
+#define ICE_IPV6_GTPU_QFI_OFFSET       76
+#define ICE_IPV4_L2TPV3_SESS_ID_OFFSET 34
+#define ICE_IPV6_L2TPV3_SESS_ID_OFFSET 54
+#define ICE_IPV4_ESP_SPI_OFFSET                34
+#define ICE_IPV6_ESP_SPI_OFFSET                54
+#define ICE_IPV4_AH_SPI_OFFSET         38
+#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_FDIR_MAX_FLTRS             16384
 
@@ -150,8 +159,13 @@ struct ice_fdir_udp_gtp {
        u8 next_ext;
 };
 
+struct ice_fdir_l2tpv3 {
+       __be32 session_id;
+};
+
 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 */
@@ -170,6 +184,9 @@ struct ice_fdir_fltr {
        struct ice_fdir_udp_gtp gtpu_data;
        struct ice_fdir_udp_gtp gtpu_mask;
 
+       struct ice_fdir_l2tpv3 l2tpv3_data;
+       struct ice_fdir_l2tpv3 l2tpv3_mask;
+
        struct ice_fdir_extra ext_data;
        struct ice_fdir_extra ext_mask;
 
@@ -189,6 +206,7 @@ struct ice_fdir_fltr {
        u16 cnt_index;
        u32 fltr_id;
        u8 fdid_prio;
+       u8 comp_report;
        /* Set to true for an ACL filter */
        bool acl_fltr;
 };
@@ -204,7 +222,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
@@ -213,7 +230,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,
@@ -223,13 +239,8 @@ ice_fdir_get_gen_prgm_pkt(struct ice_hw *hw, struct ice_fdir_fltr *input,
                          u8 *pkt, bool frag, bool tun);
 enum ice_status
 ice_fdir_get_prgm_pkt(struct ice_fdir_fltr *input, u8 *pkt, bool frag);
-enum ice_status
-ice_add_del_fdir(struct ice_hw *hw, struct ice_fdir_fltr *input, bool add);
 int ice_get_fdir_cnt_all(struct ice_hw *hw);
 bool ice_fdir_is_dup_fltr(struct ice_hw *hw, struct ice_fdir_fltr *input);
-enum ice_status
-ice_update_fdir_list_entry(struct ice_hw *hw, struct ice_fdir_fltr *input,
-                          u16 sw_idx);
 bool ice_fdir_has_frag(enum ice_fltr_ptype flow);
 struct ice_fdir_fltr *
 ice_fdir_find_fltr_by_idx(struct ice_hw *hw, u32 fltr_idx);