Commit 115122af authored by Ben Hutchings's avatar Ben Hutchings Committed by David S. Miller
Browse files

sfc: Clean up properly on reset failure paths 



If MAC switching fails, stop the port properly.

If PHY reinitialisation fails, clear the port_initialized flag.

Signed-off-by: default avatarBen Hutchings <bhutchings@solarflare.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a7ef5933

drivers/net/sfc/efx.c

+6 −3
Original line number Diff line number Diff line
@@ -557,6 +557,8 @@ static void efx_link_status_changed(struct efx_nic *efx) 


}



static void efx_fini_port(struct efx_nic *efx);



/* This call reinitialises the MAC to pick up new PHY settings. The

 * caller must hold the mac_lock */

void __efx_reconfigure_port(struct efx_nic *efx)
@@ -592,8 +594,8 @@ void __efx_reconfigure_port(struct efx_nic *efx) 


fail:

	EFX_ERR(efx, "failed to reconfigure MAC\n");

	efx->phy_op->fini(efx);

	efx->port_initialized = false;

	efx->port_enabled = false;

	efx_fini_port(efx);

}



/* Reinitialise the MAC to pick up new PHY settings, even if the port is
@@ -1667,7 +1669,8 @@ int efx_reset_up(struct efx_nic *efx, enum reset_type method, 
			rc = efx->phy_op->init(efx);

			if (rc)

				ok = false;

		} else

		}

		if (!ok)

			efx->port_initialized = false;

	}