]> Pileus Git - ~andy/linux/commitdiff
sfc: Remove early call to efx_nic_type::reconfigure_mac in efx_reset_up()
authorBen Hutchings <bhutchings@solarflare.com>
Wed, 26 Jun 2013 23:13:07 +0000 (00:13 +0100)
committerBen Hutchings <bhutchings@solarflare.com>
Tue, 27 Aug 2013 21:28:02 +0000 (22:28 +0100)
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 <bhutchings@solarflare.com>
drivers/net/ethernet/sfc/efx.c

index efad5f73e1ce398be6d4e7232e53188d78902e60..3af28a81f7cd9e5092fe09601ec87ed8af26c2cf 100644 (file)
@@ -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);