net/mlx5: add VLAN push/pop DR commands to glue

[dpdk.git] / drivers / net / ice / base / ice_common.c

diff --git a/drivers/net/ice/base/ice_common.c b/drivers/net/ice/base/ice_common.c
index 328ff3c..52fd8c8 100644 (file)
--- a/drivers/net/ice/base/ice_common.c
+++ b/drivers/net/ice/base/ice_common.c
@@ -42,7 +42,7 @@ static enum ice_status ice_set_mac_type(struct ice_hw *hw)
 {
        enum ice_status status = ICE_SUCCESS;
 
-       ice_debug(hw, ICE_DBG_TRACE, "ice_set_mac_type\n");
+       ice_debug(hw, ICE_DBG_TRACE, "%s\n", __func__);
 
        if (hw->vendor_id == ICE_INTEL_VENDOR_ID) {
                switch (hw->device_id) {
@@ -1019,9 +1019,6 @@ enum ice_status ice_check_reset(struct ice_hw *hw)
         * or EMPR has occurred. The grst delay value is in 100ms units.
         * Add 1sec for outstanding AQ commands that can take a long time.
         */
-#define GLGEN_RSTCTL           0x000B8180 /* Reset Source: POR */
-#define GLGEN_RSTCTL_GRSTDEL_S 0
-#define GLGEN_RSTCTL_GRSTDEL_M MAKEMASK(0x3F, GLGEN_RSTCTL_GRSTDEL_S)
        grst_delay = ((rd32(hw, GLGEN_RSTCTL) & GLGEN_RSTCTL_GRSTDEL_M) >>
                      GLGEN_RSTCTL_GRSTDEL_S) + 10;