net/virtio: allocate fake mbuf in Rx queue

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

diff --git a/drivers/net/ice/base/ice_acl.h b/drivers/net/ice/base/ice_acl.h
index 500db0c..a63b90f 100644 (file)
--- a/drivers/net/ice/base/ice_acl.h
+++ b/drivers/net/ice/base/ice_acl.h
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2001-2020 Intel Corporation
+ * Copyright(c) 2001-2021 Intel Corporation
  */
 
 #ifndef _ICE_ACL_H_
@@ -47,11 +47,11 @@ struct ice_acl_tbl {
 };
 
 #define ICE_MAX_ACL_TCAM_ENTRY (ICE_AQC_ACL_TCAM_DEPTH * ICE_AQC_ACL_SLICES)
-enum ice_acl_entry_prior {
-       ICE_LOW = 0,
-       ICE_NORMAL,
-       ICE_HIGH,
-       ICE_MAX_PRIOR
+enum ice_acl_entry_prio {
+       ICE_ACL_PRIO_LOW = 0,
+       ICE_ACL_PRIO_NORMAL,
+       ICE_ACL_PRIO_HIGH,
+       ICE_ACL_MAX_PRIO
 };
 
 /* Scenario structure
@@ -74,8 +74,8 @@ struct ice_acl_scen {
         * be available in this scenario
         */
        ice_declare_bitmap(entry_bitmap, ICE_MAX_ACL_TCAM_ENTRY);
-       u16 first_idx[ICE_MAX_PRIOR];
-       u16 last_idx[ICE_MAX_PRIOR];
+       u16 first_idx[ICE_ACL_MAX_PRIO];
+       u16 last_idx[ICE_ACL_MAX_PRIO];
 
        u16 id;
        u16 start;      /* Number of entry from the start of the parent table */
@@ -132,7 +132,6 @@ enum ice_status ice_acl_destroy_tbl(struct ice_hw *hw);
 enum ice_status
 ice_acl_create_scen(struct ice_hw *hw, u16 match_width, u16 num_entries,
                    u16 *scen_id);
-enum ice_status ice_acl_destroy_scen(struct ice_hw *hw, u16 scen_id);
 enum ice_status
 ice_aq_alloc_acl_tbl(struct ice_hw *hw, struct ice_acl_alloc_tbl *tbl,
                     struct ice_sq_cd *cd);
@@ -159,7 +158,7 @@ ice_aq_query_actpair(struct ice_hw *hw, u8 act_mem_idx, u16 act_entry_idx,
                     struct ice_aqc_actpair *buf, struct ice_sq_cd *cd);
 enum ice_status ice_aq_dealloc_acl_res(struct ice_hw *hw, struct ice_sq_cd *cd);
 enum ice_status
-ice_prgm_acl_prof_extrt(struct ice_hw *hw, u8 prof_id,
+ice_prgm_acl_prof_xtrct(struct ice_hw *hw, u8 prof_id,
                        struct ice_aqc_acl_prof_generic_frmt *buf,
                        struct ice_sq_cd *cd);
 enum ice_status
@@ -173,9 +172,6 @@ enum ice_status
 ice_aq_dealloc_acl_cntrs(struct ice_hw *hw, struct ice_acl_cntrs *cntrs,
                         struct ice_sq_cd *cd);
 enum ice_status
-ice_aq_query_acl_cntrs(struct ice_hw *hw, u8 bank, u16 index, u64 *cntr_val,
-                      struct ice_sq_cd *cd);
-enum ice_status
 ice_prog_acl_prof_ranges(struct ice_hw *hw, u8 prof_id,
                         struct ice_aqc_acl_profile_ranges *buf,
                         struct ice_sq_cd *cd);
@@ -196,7 +192,7 @@ ice_aq_query_acl_scen(struct ice_hw *hw, u16 scen_id,
                      struct ice_aqc_acl_scen *buf, struct ice_sq_cd *cd);
 enum ice_status
 ice_acl_add_entry(struct ice_hw *hw, struct ice_acl_scen *scen,
-                 enum ice_acl_entry_prior prior, u8 *keys, u8 *inverts,
+                 enum ice_acl_entry_prio prio, u8 *keys, u8 *inverts,
                  struct ice_acl_act_entry *acts, u8 acts_cnt, u16 *entry_idx);
 enum ice_status
 ice_acl_prog_act(struct ice_hw *hw, struct ice_acl_scen *scen,