Commit db99d512 authored Dec 26, 2019 by Christophe JAILLET Committed by David S. Miller Dec 30, 2019

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



'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>

parent f278b99c

drivers/net/ethernet/sfc/ef10_sriov.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -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)) {
		rc = efx_ef10_vport_add_mac(efx, vf->vport_id, mac);
		if (rc) {
		eth_zero_addr(vf->mac);
		if (rc)
		goto fail;
		}

		if (vf->efx)
		ether_addr_copy(vf->efx->net_dev->dev_addr, mac);
		}

Admin message