Revert "UBUNTU: SAUCE: {topost} net: hns3: fix for reset_level default assignment...

BugLink: https://bugs.launchpad.net/bugs/1787477
This reverts commit 861cd0230413ccabc40264195eb81ecc440aed75.
Signed-off-by: dann frazier <dann.frazier@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Acked-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
index 8c492a175302c7686797d26984a1d8e122a987cb..9d0e366fd6b0f89a29824e317861d0852ea1a3fd 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
@@ -3095,6 +3095,7 @@ static int hns3_client_init(struct hnae3_handle *handle)
        priv->dev = &pdev->dev;
        priv->netdev = netdev;
        priv->ae_handle = handle;
+       priv->ae_handle->reset_level = HNAE3_NONE_RESET;
        priv->ae_handle->last_reset_time = jiffies;
        priv->tx_timeout_count = 0;
 
@@ -3115,11 +3116,6 @@ static int hns3_client_init(struct hnae3_handle *handle)
        /* Carrier off reporting is important to ethtool even BEFORE open */
        netif_carrier_off(netdev);
 
-       if (handle->flags & HNAE3_SUPPORT_VF)
-               handle->reset_level = HNAE3_VF_RESET;
-       else
-               handle->reset_level = HNAE3_FUNC_RESET;
-
        ret = hns3_get_ring_config(priv);
        if (ret) {
                ret = -ENOMEM;