3a8995b1ad
Update DPDK version from 19.11 to 20.11 and also support hns3 PMD for Kunpeng 920 and Kunpeng 930. Signed-off-by: speech_white <humin29@huawei.com>
41 lines
1.2 KiB
Diff
41 lines
1.2 KiB
Diff
From 16635e5c21b02e649d7babe0db6364bfaba71bc3 Mon Sep 17 00:00:00 2001
|
|
From: Huisong Li <lihuisong@huawei.com>
|
|
Date: Thu, 29 Apr 2021 17:03:59 +0800
|
|
Subject: [PATCH 144/189] net/hns3: fix MAC enable failure rollback
|
|
|
|
If driver fails to enable MAC, it does not need to rollback the MAC
|
|
configuration. This patch fixes it.
|
|
|
|
Fixes: bdaf190f8235 ("net/hns3: support link speed autoneg for PF")
|
|
|
|
Signed-off-by: Huisong Li <lihuisong@huawei.com>
|
|
Signed-off-by: Min Hu (Connor) <humin29@huawei.com>
|
|
---
|
|
drivers/net/hns3/hns3_ethdev.c | 6 ++++--
|
|
1 file changed, 4 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c
|
|
index bba4d0f..f5160ed 100644
|
|
--- a/drivers/net/hns3/hns3_ethdev.c
|
|
+++ b/drivers/net/hns3/hns3_ethdev.c
|
|
@@ -5605,12 +5605,14 @@ hns3_do_start(struct hns3_adapter *hns, bool reset_queue)
|
|
|
|
ret = hns3_apply_link_speed(hw);
|
|
if (ret)
|
|
- goto err_config_mac_mode;
|
|
+ goto err_set_link_speed;
|
|
|
|
return 0;
|
|
|
|
-err_config_mac_mode:
|
|
+err_set_link_speed:
|
|
(void)hns3_cfg_mac_mode(hw, false);
|
|
+
|
|
+err_config_mac_mode:
|
|
hns3_dev_release_mbufs(hns);
|
|
/*
|
|
* Here is exception handling, hns3_reset_all_tqps will have the
|
|
--
|
|
2.7.4
|
|
|