net: hns3: fix napi_disable not return problem

While doing DOWN, the calling of napi_disable() may not return, since the
napi_complete() in the hns3_nic_common_poll() will never be called when
HNS3_NIC_STATE_DOWN is set. So we need to call napi_complete() before
checking HNS3_NIC_STETE_DOWN.

Fixes: ff0699e04b97 ("net: hns3: stop napi polling when HNS3_NIC_STATE_DOWN is set")
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>

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
index 2081e2eb18fd226033ad664cd9b175bdd8326d3a..e7cde084ef33011510b6d9f7cae485cbe152072b 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
@@ -2909,8 +2909,8 @@ static int hns3_nic_common_poll(struct napi_struct *napi, int budget)
        if (!clean_complete)
                return budget;
 
-       if (likely(!test_bit(HNS3_NIC_STATE_DOWN, &priv->state)) &&
-           napi_complete(napi)) {
+       if (napi_complete(napi) &&
+           likely(!test_bit(HNS3_NIC_STATE_DOWN, &priv->state))) {
                hns3_update_new_int_gl(tqp_vector);
                hns3_mask_vector_irq(tqp_vector, 1);
        }