mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-30 08:02:30 +00:00
Code Issues Releases Wiki Activity

sfc: avoid duplicate error handling code in 'efx_ef10_sriov_set_vf_mac()'

Browse source 
'eth_zero_addr()' is already called in the error handling path. This is
harmless, but there is no point in calling it twice, so remove one.

Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Christophe JAILLET 2019-12-26 16:02:24 +01:00 committed by David S. Miller
parent f278b99ca6
commit db99d5126f
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
drivers/net/ethernet/sfc/ef10_sriov.c
View file

@ -522,10 +522,9 @@ int efx_ef10_sriov_set_vf_mac(struct efx_nic *efx, int vf_i, u8 *mac)
if (!is_zero_ether_addr(mac)) { if (!is_zero_ether_addr(mac)) {
rc = efx_ef10_vport_add_mac(efx, vf->vport_id, mac); rc = efx_ef10_vport_add_mac(efx, vf->vport_id, mac);
if (rc) { if (rc)
eth_zero_addr(vf->mac);
goto fail; goto fail;
}
if (vf->efx) if (vf->efx)
ether_addr_copy(vf->efx->net_dev->dev_addr, mac); ether_addr_copy(vf->efx->net_dev->dev_addr, mac);
} }