summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/sfc/efx.c
diff options
context:
space:
mode:
authorBen Hutchings <bhutchings@solarflare.com>2013-06-27 00:13:07 +0100
committerBen Hutchings <bhutchings@solarflare.com>2013-08-27 22:28:02 +0100
commitba388fdd08ff458fabc8588e565b5d031191c50a (patch)
tree1f5322fb256aede0369b17cca8615dd3f392c397 /drivers/net/ethernet/sfc/efx.c
parentd36a08b4ae08566426ddb7519b869ec0cd040532 (diff)
downloadop-kernel-dev-ba388fdd08ff458fabc8588e565b5d031191c50a.zip
op-kernel-dev-ba388fdd08ff458fabc8588e565b5d031191c50a.tar.gz
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 <bhutchings@solarflare.com>
Diffstat (limited to 'drivers/net/ethernet/sfc/efx.c')
-rw-r--r--drivers/net/ethernet/sfc/efx.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/ethernet/sfc/efx.c b/drivers/net/ethernet/sfc/efx.c
index efad5f7..3af28a8 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);
OpenPOWER on IntegriCloud