net/ena: update version to 2.0.1

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

diff --git a/drivers/net/ice/base/ice_type.h b/drivers/net/ice/base/ice_type.h
index 2354d4f..b03f18d 100644 (file)
--- a/drivers/net/ice/base/ice_type.h
+++ b/drivers/net/ice/base/ice_type.h
@@ -22,13 +22,9 @@
 #define ICE_BYTES_PER_DWORD    4
 #define ICE_MAX_TRAFFIC_CLASS  8
 
-#ifndef MIN_T
 #define MIN_T(_t, _a, _b)      min((_t)(_a), (_t)(_b))
-#endif
 
-#ifndef IS_ASCII
 #define IS_ASCII(_ch)  ((_ch) < 0x80)
-#endif
 
 #include "ice_status.h"
 #include "ice_hw_autogen.h"
@@ -45,9 +41,7 @@ static inline bool ice_is_tc_ena(ice_bitmap_t bitmap, u8 tc)
        return ice_is_bit_set(&bitmap, tc);
 }
 
-#ifndef DIV_64BIT
 #define DIV_64BIT(n, d) ((n) / (d))
-#endif /* DIV_64BIT */
 
 static inline u64 round_up_64bit(u64 a, u32 b)
 {
@@ -102,6 +96,9 @@ static inline u32 ice_round_to_num(u32 N, u32 R)
 #define ICE_DBG_USER           BIT_ULL(31)
 #define ICE_DBG_ALL            0xFFFFFFFFFFFFFFFFULL
 
+#ifndef __ALWAYS_UNUSED
+#define __ALWAYS_UNUSED
+#endif
 
 
 
@@ -189,9 +186,6 @@ enum ice_media_type {
 enum ice_vsi_type {
        ICE_VSI_PF = 0,
        ICE_VSI_CTRL = 3,       /* equates to ICE_VSI_PF with 1 queue pair */
-#ifdef ADQ_SUPPORT
-       ICE_VSI_CHNL = 4,
-#endif /* ADQ_SUPPORT */
        ICE_VSI_LB = 6,
 };
 
@@ -911,9 +905,6 @@ struct ice_hw_port_stats {
        /* flow director stats */
        u32 fd_sb_status;
        u64 fd_sb_match;
-#ifdef ADQ_SUPPORT
-       u64 ch_atr_match;
-#endif /* ADQ_SUPPORT */
 };
 
 enum ice_sw_fwd_act_type {
@@ -980,6 +971,8 @@ enum ice_sw_fwd_act_type {
 #define ICE_SR_NVM_BANK_SIZE                   0x43
 #define ICE_SR_1ND_OROM_BANK_PTR               0x44
 #define ICE_SR_OROM_BANK_SIZE                  0x45
+#define ICE_SR_NETLIST_BANK_PTR                        0x46
+#define ICE_SR_NETLIST_BANK_SIZE               0x47
 #define ICE_SR_EMP_SR_SETTINGS_PTR             0x48
 #define ICE_SR_CONFIGURATION_METADATA_PTR      0x4D
 #define ICE_SR_IMMEDIATE_VALUES_PTR            0x4E