diff options
| author |   Huazhong Tan <tanhuazhong@huawei.com> | 2019-04-06 15:43:28 +0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2019-04-08 15:30:49 -0700 |
| commit | eb32c896f10a8685162480279bd79f992b33319e (patch) | |
| tree | eb326497282b93987ca72ee3029f4ea3343af1d8 /drivers | |
| parent | net: hns3: not reset vport who not alive when PF reset (diff) | |
| download | linux-dev-eb32c896f10a8685162480279bd79f992b33319e.tar.xz linux-dev-eb32c896f10a8685162480279bd79f992b33319e.zip | |
net: hns3: adjust the timing of hns3_client_stop when unloading
hns3_client_stop() should be called after unregister_netdev(),
otherwise the ongoing reset task may start the client just after it.
Fixes: a6d818e31d08 ("net: hns3: Add vport alive state checking support")
Signed-off-by: Huazhong Tan <tanhuazhong@huawei.com>
Signed-off-by: Peng Li <lipeng321@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c index edfe8566fc30..b53b0911ec24 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c @@ -3718,13 +3718,13 @@ static void hns3_client_uninit(struct hnae3_handle *handle, bool reset) struct hns3_nic_priv *priv = netdev_priv(netdev); int ret; - hns3_client_stop(handle); - hns3_remove_hw_addr(netdev); if (netdev->reg_state != NETREG_UNINITIALIZED) unregister_netdev(netdev); + hns3_client_stop(handle); + if (!test_and_clear_bit(HNS3_NIC_STATE_INITED, &priv->state)) { netdev_warn(netdev, "already uninitialized\n"); goto out_netdev_free; |