From: Ben Hutchings Date: Wed, 26 Jun 2013 23:13:07 +0000 (+0100) Subject: sfc: Remove early call to efx_nic_type::reconfigure_mac in efx_reset_up() X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ba388fdd08ff458fabc8588e565b5d031191c50a;p=linux-beck.git sfc: Remove early call to efx_nic_type::reconfigure_mac in efx_reset_up() efx_reset_up() calls efx_nic_type::reconfigure_mac once directly, then again through efx_start_all() -> efx_start_port() -> efx->type->reconfigure_mac(). This first call is also made too early to work properly on EF10. Signed-off-by: Ben Hutchings --- diff --git a/drivers/net/ethernet/sfc/efx.c b/drivers/net/ethernet/sfc/efx.c index efad5f73e1ce..3af28a81f7cd 100644 --- a/drivers/net/ethernet/sfc/efx.c +++ b/drivers/net/ethernet/sfc/efx.c @@ -2202,8 +2202,6 @@ int efx_reset_up(struct efx_nic *efx, enum reset_type method, bool ok) "could not restore PHY settings\n"); } - efx->type->reconfigure_mac(efx); - efx_enable_interrupts(efx); efx_restore_filters(efx); efx_sriov_reset(efx);