| Message ID | 1546225109-19631-1-git-send-email-tanhuazhong@huawei.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
| Series | [net] net: hns3: call hns3_nic_net_open() while doing HNAE3_UP_CLIENT | expand |
From: Huazhong Tan <tanhuazhong@huawei.com> Date: Mon, 31 Dec 2018 10:58:29 +0800 > For HNAE3_DOWN_CLIENT calling hns3_nic_net_stop(), HNAE3_UP_CLIENT > should call hns3_nic_net_open(), since if the number of queue or > the map of TC has is changed before HHAE3_UP_CLIENT is called, > it will cause problem. > > Also the HNS3_NIC_STATE_RESETTING flag needs to be cleared before > hns3_nic_net_open() called, and set it back while hns3_nic_net_open() > failed. > > Fixes: bb6b94a896d4 ("net: hns3: Add reset interface implementation in client") > Signed-off-by: Huazhong Tan <tanhuazhong@huawei.com> > Signed-off-by: Yunsheng Lin <linyunsheng@huawei.com> > Signed-off-by: Peng Li <lipeng321@huawei.com> Applied and queued up for -stable.
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c index d3b9aaf..07cd587 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c @@ -3995,17 +3995,18 @@ static int hns3_reset_notify_up_enet(struct hnae3_handle *handle) struct hns3_nic_priv *priv = netdev_priv(kinfo->netdev); int ret = 0; + clear_bit(HNS3_NIC_STATE_RESETTING, &priv->state); + if (netif_running(kinfo->netdev)) { - ret = hns3_nic_net_up(kinfo->netdev); + ret = hns3_nic_net_open(kinfo->netdev); if (ret) { + set_bit(HNS3_NIC_STATE_RESETTING, &priv->state); netdev_err(kinfo->netdev, "hns net up fail, ret=%d!\n", ret); return ret; } } - clear_bit(HNS3_NIC_STATE_RESETTING, &priv->state); - return ret; }
For HNAE3_DOWN_CLIENT calling hns3_nic_net_stop(), HNAE3_UP_CLIENT should call hns3_nic_net_open(), since if the number of queue or the map of TC has is changed before HHAE3_UP_CLIENT is called, it will cause problem. Also the HNS3_NIC_STATE_RESETTING flag needs to be cleared before hns3_nic_net_open() called, and set it back while hns3_nic_net_open() failed. Fixes: bb6b94a896d4 ("net: hns3: Add reset interface implementation in client") Signed-off-by: Huazhong Tan <tanhuazhong@huawei.com> Signed-off-by: Yunsheng Lin <linyunsheng@huawei.com> Signed-off-by: Peng Li <lipeng321@huawei.com> --- drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)