From 5228f8ff4443afed13e1294f82580133eb38c065 Mon Sep 17 00:00:00 2001
From: Steve Hodgson <shodgson@solarflare.com>
Date: Wed, 28 Apr 2010 09:28:10 +0000
Subject: [PATCH] --- yaml --- r: 194590 b: refs/heads/master c:
 b7b40eeb0f76e73503a7e5a98d1353c2e42d9a18 h: refs/heads/master v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/net/sfc/falcon.c      | 3 +++
 trunk/drivers/net/sfc/falcon_xmac.c | 2 +-
 trunk/drivers/net/sfc/nic.h         | 1 +
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index b139a01d5628..a58fb2aa780f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ef524f2e74b39cdf8d42b9d999c43b5144ed66c9
+refs/heads/master: b7b40eeb0f76e73503a7e5a98d1353c2e42d9a18
diff --git a/trunk/drivers/net/sfc/falcon.c b/trunk/drivers/net/sfc/falcon.c
index d09ad1b1cd8b..f7df24dce38a 100644
--- a/trunk/drivers/net/sfc/falcon.c
+++ b/trunk/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)
diff --git a/trunk/drivers/net/sfc/falcon_xmac.c b/trunk/drivers/net/sfc/falcon_xmac.c
index 3d65abf85b97..c84a2ce2ccbb 100644
--- a/trunk/drivers/net/sfc/falcon_xmac.c
+++ b/trunk/drivers/net/sfc/falcon_xmac.c
@@ -26,7 +26,7 @@
  *************************************************************************/
 
 /* Configure the XAUI driver that is an output from Falcon */
-static void falcon_setup_xaui(struct efx_nic *efx)
+void falcon_setup_xaui(struct efx_nic *efx)
 {
 	efx_oword_t sdctl, txdrv;
 
diff --git a/trunk/drivers/net/sfc/nic.h b/trunk/drivers/net/sfc/nic.h
index 9351c0331a47..7e3bec8561b8 100644
--- a/trunk/drivers/net/sfc/nic.h
+++ b/trunk/drivers/net/sfc/nic.h
@@ -203,6 +203,7 @@ extern void falcon_irq_ack_a1(struct efx_nic *efx);
 extern int efx_nic_flush_queues(struct efx_nic *efx);
 extern void falcon_start_nic_stats(struct efx_nic *efx);
 extern void falcon_stop_nic_stats(struct efx_nic *efx);
+extern void falcon_setup_xaui(struct efx_nic *efx);
 extern int falcon_reset_xaui(struct efx_nic *efx);
 extern void efx_nic_init_common(struct efx_nic *efx);