]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
net: hns3: adjust the timing of hns3_client_stop when unloading
authorHuazhong Tan <tanhuazhong@huawei.com>
Sat, 6 Apr 2019 07:43:28 +0000 (15:43 +0800)
committerDavid S. Miller <davem@davemloft.net>
Mon, 8 Apr 2019 22:30:49 +0000 (15:30 -0700)
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>
drivers/net/ethernet/hisilicon/hns3/hns3_enet.c

index edfe8566fc30dbe2dad314373968a16de3c686c3..b53b0911ec24123db5e37dbf7f54230b63149088 100644 (file)
@@ -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;