diff options
| author | Luo bin <luobin9@huawei.com> | 2020-09-24 04:31:51 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-09-25 06:00:40 +0300 |
| commit | f68910a8056f9451ee9fe7e1b962f7d90d326ad3 (patch) | |
| tree | f32b6758866def48f1bf1927532d4bbcb7796fe8 /drivers/net/ethernet/huawei/hinic/hinic_port.c | |
| parent | ed46cd1d4cc4b2cf05f31fe25fc68d1a9d3589ba (diff) | |
| download | linux-f68910a8056f9451ee9fe7e1b962f7d90d326ad3.tar.xz | |
hinic: fix wrong return value of mac-set cmd
It should also be regarded as an error when hw return status=4 for PF's
setting mac cmd. Only if PF return status=4 to VF should this cmd be
taken special treatment.
Fixes: 7dd29ee12865 ("hinic: add sriov feature support")
Signed-off-by: Luo bin <luobin9@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/huawei/hinic/hinic_port.c')
| -rw-r--r-- | drivers/net/ethernet/huawei/hinic/hinic_port.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ethernet/huawei/hinic/hinic_port.c b/drivers/net/ethernet/huawei/hinic/hinic_port.c index 02cd635d6914..eb97f2d6b1ad 100644 --- a/drivers/net/ethernet/huawei/hinic/hinic_port.c +++ b/drivers/net/ethernet/huawei/hinic/hinic_port.c @@ -58,9 +58,9 @@ static int change_mac(struct hinic_dev *nic_dev, const u8 *addr, sizeof(port_mac_cmd), &port_mac_cmd, &out_size); if (err || out_size != sizeof(port_mac_cmd) || - (port_mac_cmd.status && - port_mac_cmd.status != HINIC_PF_SET_VF_ALREADY && - port_mac_cmd.status != HINIC_MGMT_STATUS_EXIST)) { + (port_mac_cmd.status && + (port_mac_cmd.status != HINIC_PF_SET_VF_ALREADY || !HINIC_IS_VF(hwif)) && + port_mac_cmd.status != HINIC_MGMT_STATUS_EXIST)) { dev_err(&pdev->dev, "Failed to change MAC, err: %d, status: 0x%x, out size: 0x%x\n", err, port_mac_cmd.status, out_size); return -EFAULT; |