[linux-yocto] [PATCH 46/89] drivers/net: The work around for Amarillo needs to be done the first time as well!

[Paul Butler]

From: John Jacques <john.jacques at lsi.com>

Signed-off-by: John Jacques <john.jacques at lsi.com>
---
 drivers/net/ethernet/lsi/lsi_acp_net.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/net/ethernet/lsi/lsi_acp_net.c b/drivers/net/ethernet/lsi/lsi_acp_net.c
index 331c8e4..cfd8106 100644
--- a/drivers/net/ethernet/lsi/lsi_acp_net.c
+++ b/drivers/net/ethernet/lsi/lsi_acp_net.c
@@ -181,6 +181,11 @@ static void appnic_handle_link_change(struct net_device *dev)
 		status_change = 1;
 	}
 
+#ifdef AMARILLO_WA
+	rx_configuration &= ~0x1000;
+	tx_configuration &= ~0x1000;
+#endif
+
 	if (status_change) {
 		if (phydev->link) {
 			netif_carrier_on(dev);
@@ -193,11 +198,6 @@ static void appnic_handle_link_change(struct net_device *dev)
 			netdev_info(dev, "link down\n");
 		}
 
-#ifdef AMARILLO_WA
-		rx_configuration &= ~0x1000;
-		tx_configuration &= ~0x1000;
-#endif
-
 		if (rx_configuration != read_mac(APPNIC_RX_CONF))
 			write_mac(rx_configuration, APPNIC_RX_CONF);
 
-- 
1.8.3.4