net: hns3: fix show wrong state when add existing uc mac address
[ 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: 72110b5674
("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>
This commit is contained in:

committed by
Greg Kroah-Hartman

parent
64dae9551f
commit
d4a14faf79
@@ -7581,15 +7581,8 @@ int hclge_add_uc_addr_common(struct hclge_vport *vport,
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* check if we just hit the duplicate */
|
/* check if we just hit the duplicate */
|
||||||
if (!ret) {
|
if (!ret)
|
||||||
dev_warn(&hdev->pdev->dev, "VF %u mac(%pM) exists\n",
|
return -EEXIST;
|
||||||
vport->vport_id, addr);
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
dev_err(&hdev->pdev->dev,
|
|
||||||
"PF failed to add unicast entry(%pM) in the MAC table\n",
|
|
||||||
addr);
|
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
@@ -7743,6 +7736,12 @@ static void hclge_sync_vport_mac_list(struct hclge_vport *vport,
|
|||||||
} else {
|
} else {
|
||||||
set_bit(HCLGE_VPORT_STATE_MAC_TBL_CHANGE,
|
set_bit(HCLGE_VPORT_STATE_MAC_TBL_CHANGE,
|
||||||
&vport->state);
|
&vport->state);
|
||||||
|
|
||||||
|
/* 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;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user