Unverified Commit 369da114 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!1919 net: hns3: revert some patch and backport some hns3 mainline 

Merge Pull Request from: @svishen 
 
Revert some patch and backport some hns3 mainline

issue:
https://gitee.com/openeuler/kernel/issues/I7WQZ1 
 
Link:https://gitee.com/openeuler/kernel/pulls/1919

 

Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 2269ba53 3516fbed

drivers/net/ethernet/hisilicon/hns3/hns3_enet.c

+13 −1
Original line number Diff line number Diff line
@@ -6109,6 +6109,9 @@ void hns3_external_lb_prepare(struct net_device *ndev, bool if_running) 
	if (!if_running)

		return;



	if (test_and_set_bit(HNS3_NIC_STATE_DOWN, &priv->state))

		return;



	netif_carrier_off(ndev);

	netif_tx_disable(ndev);
@@ -6137,7 +6140,16 @@ void hns3_external_lb_restore(struct net_device *ndev, bool if_running) 
	if (!if_running)

		return;



	hns3_nic_reset_all_ring(priv->ae_handle);

	if (hns3_nic_resetting(ndev))

		return;



	if (!test_bit(HNS3_NIC_STATE_DOWN, &priv->state))

		return;



	if (hns3_nic_reset_all_ring(priv->ae_handle))

		return;



	clear_bit(HNS3_NIC_STATE_DOWN, &priv->state);



	for (i = 0; i < priv->vector_num; i++)

		hns3_vector_enable(&priv->tqp_vector[i]);