net: hns3: add initialization for nic state

This patch adds initialization for nic state, sets flag
HNS3_NIC_STATE_DOWN when initialize, clears it before
vectors and napi being enabled in the hns3_nic_net_up(),
and sets it back in the error handler.

Signed-off-by: Jian Shen <shenjian15@huawei.com>
Signed-off-by: Huazhong Tan <tanhuazhong@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
index 216f3dd25cd6ea1fab8378ca211b1f5be2e825fd..4b38c37eef8fba37f03f2d66ecaffcc4f3c4a61f 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
@@ -348,6 +348,8 @@ static int hns3_nic_net_up(struct net_device *netdev)
                return ret;
        }
 
+       clear_bit(HNS3_NIC_STATE_DOWN, &priv->state);
+
        /* enable the vectors */
        for (i = 0; i < priv->vector_num; i++)
                hns3_vector_enable(&priv->tqp_vector[i]);
@@ -361,11 +363,10 @@ static int hns3_nic_net_up(struct net_device *netdev)
        if (ret)
                goto out_start_err;
 
-       clear_bit(HNS3_NIC_STATE_DOWN, &priv->state);
-
        return 0;
 
 out_start_err:
+       set_bit(HNS3_NIC_STATE_DOWN, &priv->state);
        while (j--)
                hns3_tqp_disable(h->kinfo.tqp[j]);
 
@@ -3614,6 +3615,7 @@ static int hns3_client_init(struct hnae3_handle *handle)
        priv->netdev = netdev;
        priv->ae_handle = handle;
        priv->tx_timeout_count = 0;
+       set_bit(HNS3_NIC_STATE_DOWN, &priv->state);
 
        handle->kinfo.netdev = netdev;
        handle->priv = (void *)priv;