79 lines
2.7 KiB
Diff
79 lines
2.7 KiB
Diff
From 9a0dab187b71a973fe8b452daa4df052ee5aeb4b Mon Sep 17 00:00:00 2001
|
|
From: Jian Shen <shenjian15@huawei.com>
|
|
Date: Mon, 15 Nov 2021 19:40:54 +0800
|
|
Subject: [PATCH 131/283] net: hns3: fix show wrong state when add existing uc
|
|
mac address
|
|
|
|
mainline inclusion
|
|
from mainline-v5.15-rc4
|
|
commit 108b3c7810e14892c4a1819b1d268a2c785c087c
|
|
category: bugfix
|
|
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I8EMYT
|
|
|
|
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=108b3c7810e14892c4a1819b1d268a2c785c087c
|
|
|
|
--------------------------------
|
|
|
|
[ Upstream commit 108b3c7810e14892c4a1819b1d268a2c785c087c ]
|
|
|
|
Currently, if function adds an existing unicast mac address, eventhough
|
|
driver will not add this address into hardware, but it will return 0 in
|
|
function hclge_add_uc_addr_common(). It will cause the state of this
|
|
unicast mac address is ACTIVE in driver, but it should be in TO-ADD state.
|
|
|
|
To fix this problem, function hclge_add_uc_addr_common() returns -EEXIST
|
|
if mac address is existing, and delete two error log to avoid printing
|
|
them all the time after this modification.
|
|
|
|
Fixes: 72110b567479 ("net: hns3: return 0 and print warning when hit duplicate MAC")
|
|
Signed-off-by: Jian Shen <shenjian15@huawei.com>
|
|
Signed-off-by: Guangbin Huang <huangguangbin2@huawei.com>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
Signed-off-by: Sasha Levin <sashal@kernel.org>
|
|
Signed-off-by: Chen Jun <chenjun102@huawei.com>
|
|
Acked-by: Weilong Chen <chenweilong@huawei.com>
|
|
|
|
Signed-off-by: Chen Jun <chenjun102@huawei.com>
|
|
Signed-off-by: Zheng Zengkai <zhengzengkai@huawei.com>
|
|
Signed-off-by: Xiaodong Li <lixiaodong67@huawei.com>
|
|
|
|
Conflicts:
|
|
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
|
|
---
|
|
.../net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 12 +++++++-----
|
|
1 file changed, 7 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
|
|
index 438f419f4132..64371eeaf9e7 100644
|
|
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
|
|
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
|
|
@@ -7931,10 +7931,6 @@ int hclge_add_uc_addr_common(struct hclge_vport *vport,
|
|
if (!ret)
|
|
return -EEXIST;
|
|
|
|
- dev_err(&hdev->pdev->dev,
|
|
- "PF failed to add unicast entry(%pM) in the MAC table\n",
|
|
- addr);
|
|
-
|
|
return -ENOSPC;
|
|
}
|
|
|
|
@@ -8091,7 +8087,13 @@ static void hclge_sync_mac_list(struct hclge_vport *vport,
|
|
} else {
|
|
set_bit(HCLGE_VPORT_STATE_MAC_TBL_CHANGE,
|
|
&vport->state);
|
|
- break;
|
|
+
|
|
+ /* If one unicast mac address is existing in hardware,
|
|
+ * we need to try whether other unicast mac addresses
|
|
+ * are new addresses that can be added.
|
|
+ */
|
|
+ if (ret != -EEXIST)
|
|
+ break;
|
|
}
|
|
}
|
|
}
|
|
--
|
|
2.34.1
|
|
|