]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
net: hns3: Set STATE_DOWN bit of hdev state when stopping net
authorFuyun Liang <liangfuyun1@huawei.com>
Wed, 19 Sep 2018 17:29:52 +0000 (18:29 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 13 Nov 2018 19:08:27 +0000 (11:08 -0800)
[ Upstream commit 2f7e489611bc685b8e00aba436032a8aac6cac57 ]

We clear STATE_DOWN bit of hdev state when starting net, but do not set
it again when stopping net. It causes that the net is down, but hdev state
is still up. STATE_DOWN bit of hdev state should be set when stopping net.

Fixes: 46a3df9f9718 ("net: hns3: Add HNS3 Acceleration Engine & Compatibility Layer Support")
Fixes: e2cb1dec9779 ("net: hns3: Add HNS3 VF HCL(Hardware Compatibility Layer) Support")
Signed-off-by: Fuyun Liang <liangfuyun1@huawei.com>
Signed-off-by: Peng Li <lipeng321@huawei.com>
Signed-off-by: Salil Mehta <salil.mehta@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c

index 0c64089c914fada5a060cec5c8edccdd3af3df0f..dd1e390ed68ef50a2c683faf91c4d697449d26aa 100644 (file)
@@ -3814,6 +3814,8 @@ static void hclge_ae_stop(struct hnae3_handle *handle)
        struct hclge_dev *hdev = vport->back;
        int i;
 
+       set_bit(HCLGE_STATE_DOWN, &hdev->state);
+
        del_timer_sync(&hdev->service_timer);
        cancel_work_sync(&hdev->service_task);
        clear_bit(HCLGE_STATE_SERVICE_SCHED, &hdev->state);
index d78064bb718a416d8ad4094bc85e4c56fd47b7e3..320043e87fc62c8e48c5b77a9420e1c967acd8f5 100644 (file)
@@ -1451,6 +1451,8 @@ static void hclgevf_ae_stop(struct hnae3_handle *handle)
        struct hclgevf_dev *hdev = hclgevf_ae_get_hdev(handle);
        int i, queue_id;
 
+       set_bit(HCLGEVF_STATE_DOWN, &hdev->state);
+
        for (i = 0; i < hdev->num_tqps; i++) {
                /* Ring disable */
                queue_id = hclgevf_get_queue_id(handle->kinfo.tqp[i]);