net/bnxt: remove redundant macro
authorKalesh AP <kalesh-anakkur.purayil@broadcom.com>
Tue, 28 Jan 2020 07:29:19 +0000 (12:59 +0530)
committerFerruh Yigit <ferruh.yigit@intel.com>
Wed, 5 Feb 2020 08:51:20 +0000 (09:51 +0100)
Use "dev->data->dev_started" state, instead of local BNXT_FLAG_INIT_DONE
to check whether device has been initialised or not.

Fixes: ed2ced6fe927 ("net/bnxt: check initialization before accessing stats")
Cc: stable@dpdk.org
Reviewed-by: Santoshkumar Karanappa Rastapur <santosh.rastapur@broadcom.com>
Reviewed-by: Ajit Khaparde <ajit.khaparde@broadcom.com>
Signed-off-by: Somnath Kotur <somnath.kotur@broadcom.com>
Signed-off-by: Kalesh AP <kalesh-anakkur.purayil@broadcom.com>
drivers/net/bnxt/bnxt.h
drivers/net/bnxt/bnxt_ethdev.c
drivers/net/bnxt/bnxt_stats.c

index bca9ad4..95f1f1a 100644 (file)
@@ -520,7 +520,6 @@ struct bnxt {
 #define BNXT_FLAG_FW_HEALTH_CHECK_SCHEDULED    BIT(18)
 #define BNXT_FLAG_EXT_STATS_SUPPORTED          BIT(19)
 #define BNXT_FLAG_NEW_RM                       BIT(20)
-#define BNXT_FLAG_INIT_DONE                    BIT(21)
 #define BNXT_FLAG_FW_CAP_ONE_STEP_TX_TS                BIT(22)
 #define BNXT_FLAG_ADV_FLOW_MGMT                        BIT(23)
 #define BNXT_FLAG_RX_VECTOR_PKT_MODE           BIT(24)
index 267a361..b04685c 100644 (file)
@@ -887,7 +887,6 @@ static int bnxt_dev_start_op(struct rte_eth_dev *eth_dev)
        eth_dev->rx_pkt_burst = bnxt_receive_function(eth_dev);
        eth_dev->tx_pkt_burst = bnxt_transmit_function(eth_dev);
 
-       bp->flags |= BNXT_FLAG_INIT_DONE;
        eth_dev->data->dev_started = 1;
        pthread_mutex_lock(&bp->def_cp_lock);
        bnxt_schedule_fw_health_check(bp);
@@ -947,7 +946,6 @@ static void bnxt_dev_stop_op(struct rte_eth_dev *eth_dev)
 
        bnxt_cancel_fw_health_check(bp);
 
-       bp->flags &= ~BNXT_FLAG_INIT_DONE;
        bnxt_dev_set_link_down_op(eth_dev);
 
        /* Wait for link to be reset and the async notification to process.
index 32f112b..4668629 100644 (file)
@@ -389,7 +389,7 @@ int bnxt_stats_get_op(struct rte_eth_dev *eth_dev,
        if (rc)
                return rc;
 
-       if (!(bp->flags & BNXT_FLAG_INIT_DONE))
+       if (!eth_dev->data->dev_started)
                return -EIO;
 
        num_q_stats = RTE_MIN(bp->rx_cp_nr_rings,
@@ -434,7 +434,7 @@ int bnxt_stats_reset_op(struct rte_eth_dev *eth_dev)
        if (ret)
                return ret;
 
-       if (!(bp->flags & BNXT_FLAG_INIT_DONE)) {
+       if (!eth_dev->data->dev_started) {
                PMD_DRV_LOG(ERR, "Device Initialization not complete!\n");
                return -EINVAL;
        }