82 lines
2.7 KiB
Diff
82 lines
2.7 KiB
Diff
From f0fe0a6e0c0030488aacf862fdabbbc93f95e9a5 Mon Sep 17 00:00:00 2001
|
|
From: Huazhong Tan <tanhuazhong@huawei.com>
|
|
Date: Tue, 28 May 2019 17:03:01 +0800
|
|
Subject: [PATCH 010/283] net: hns3: adjust hns3_uninit_phy()'s location in the
|
|
hns3_client_uninit()
|
|
|
|
mainline inclusion
|
|
from mainline-v5.3-rc1
|
|
commit 0d2f68c7bcf4c7bbdd6f810f7b6e658f43d4461e
|
|
category: bugfix
|
|
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I8EJ0A
|
|
|
|
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=0d2f68c7bcf4c7bbdd6f810f7b6e658f43d4461e
|
|
|
|
--------------------------------
|
|
|
|
hns3_uninit_phy() should be called before checking
|
|
HNS3_NIC_STATE_INITED flags, otherwise when this checking fails,
|
|
there is nobody to call hns3_uninit_phy().
|
|
|
|
Fixes: c8a8045b2d0a ("net: hns3: Fix NULL deref when unloading driver")
|
|
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>
|
|
Signed-off-by: Xiaodong Li <lixiaodong67@huawei.com>
|
|
|
|
Conflicts:
|
|
drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
|
|
---
|
|
drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 14 +-------------
|
|
1 file changed, 1 insertion(+), 13 deletions(-)
|
|
|
|
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
|
|
index b184c3e83e05..6c474df3e5c4 100644
|
|
--- a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
|
|
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
|
|
@@ -4111,14 +4111,6 @@ static void hns3_uninit_phy(struct net_device *netdev)
|
|
h->ae_algo->ops->mac_disconnect_phy(h);
|
|
}
|
|
|
|
-static void hns3_del_all_fd_rules(struct net_device *netdev, bool clear_list)
|
|
-{
|
|
- struct hnae3_handle *h = hns3_get_handle(netdev);
|
|
-
|
|
- if (h->ae_algo->ops->del_all_fd_entries)
|
|
- h->ae_algo->ops->del_all_fd_entries(h, clear_list);
|
|
-}
|
|
-
|
|
static int hns3_client_start(struct hnae3_handle *handle)
|
|
{
|
|
if (!handle->ae_algo->ops->client_start)
|
|
@@ -4299,7 +4291,6 @@ static void hns3_client_uninit(struct hnae3_handle *handle, bool reset)
|
|
{
|
|
struct net_device *netdev = handle->kinfo.netdev;
|
|
struct hns3_nic_priv *priv = netdev_priv(netdev);
|
|
- int ret;
|
|
|
|
if (netdev->reg_state != NETREG_UNINITIALIZED)
|
|
unregister_netdev(netdev);
|
|
@@ -4317,7 +4308,6 @@ static void hns3_client_uninit(struct hnae3_handle *handle, bool reset)
|
|
|
|
hns3_nic_uninit_irq(priv);
|
|
|
|
- hns3_del_all_fd_rules(netdev, true);
|
|
|
|
hns3_clear_all_ring(handle, true);
|
|
|
|
@@ -4325,9 +4315,7 @@ static void hns3_client_uninit(struct hnae3_handle *handle, bool reset)
|
|
|
|
hns3_nic_dealloc_vector_data(priv);
|
|
|
|
- ret = hns3_uninit_all_ring(priv);
|
|
- if (ret)
|
|
- netdev_err(netdev, "uninit ring error\n");
|
|
+ hns3_uninit_all_ring(priv);
|
|
|
|
hns3_put_ring_config(priv);
|
|
|
|
--
|
|
2.34.1
|
|
|