summaryrefslogtreecommitdiffstats
path: root/drivers/net/sfc/falcon.c
diff options
context:
space:
mode:
authorSteve Hodgson <shodgson@solarflare.com>2010-04-28 11:28:10 +0200
committerDavid S. Miller <davem@davemloft.net>2010-04-28 21:44:34 +0200
commitb7b40eeb0f76e73503a7e5a98d1353c2e42d9a18 (patch)
tree866649435f34be175f2eedc7e0fde65750b997f9 /drivers/net/sfc/falcon.c
parentsfc: Stop masking out XGMII faults over reconfigures (diff)
downloadlinux-b7b40eeb0f76e73503a7e5a98d1353c2e42d9a18.tar.xz
linux-b7b40eeb0f76e73503a7e5a98d1353c2e42d9a18.zip
sfc: Reconfigure the XAUI serdes after an EM reset
Fix a regression introduced in d3245b28ef2a45ec4e115062a38100bd06229289 "sfc: Refactor link configuration". Signed-off-by: Ben Hutchings <bhutchings@solarflare.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/sfc/falcon.c')
-rw-r--r--drivers/net/sfc/falcon.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/sfc/falcon.c b/drivers/net/sfc/falcon.c
index d09ad1b1cd8b..f7df24dce38a 100644
--- a/drivers/net/sfc/falcon.c
+++ b/drivers/net/sfc/falcon.c
@@ -507,6 +507,9 @@ static void falcon_reset_macs(struct efx_nic *efx)
/* Ensure the correct MAC is selected before statistics
* are re-enabled by the caller */
efx_writeo(efx, &mac_ctrl, FR_AB_MAC_CTRL);
+
+ /* This can run even when the GMAC is selected */
+ falcon_setup_xaui(efx);
}
void falcon_drain_tx_fifo(struct efx_nic *efx)