[linux-yocto] [PATCH 23/89] drivers/net: Use the ASIC watermark value for now.

[Paul Butler]

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

Note that this will break emulation!

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

diff --git a/drivers/net/ethernet/lsi/lsi_acp_net.c b/drivers/net/ethernet/lsi/lsi_acp_net.c
index a574656..0fedb36 100644
--- a/drivers/net/ethernet/lsi/lsi_acp_net.c
+++ b/drivers/net/ethernet/lsi/lsi_acp_net.c
@@ -3352,8 +3352,8 @@ appnic_init(struct net_device *device)
 	write_mac_(0x1, APPNIC_RX_MODE);
 	write_mac_(0x0, APPNIC_TX_SOFT_RESET);
 	write_mac_(0x1, APPNIC_TX_MODE);
-	/*write_mac_(0x300a, APPNIC_TX_WATERMARK);*/
-	write_mac_(0x7f007f, APPNIC_TX_WATERMARK);
+	write_mac_(0x300a, APPNIC_TX_WATERMARK);
+	/*write_mac_(0x7f007f, APPNIC_TX_WATERMARK);*/
 	write_mac_(0x1, APPNIC_TX_HALF_DUPLEX_CONF);
 	write_mac_(0xffff, APPNIC_TX_TIME_VALUE_CONF);
 	write_mac_(0x1, APPNIC_TX_INTERRUPT_CONTROL);
@@ -5261,10 +5261,11 @@ int appnic_init(struct net_device *dev)
 	write_mac(0x1, APPNIC_RX_MODE);
 	write_mac(0x0, APPNIC_TX_SOFT_RESET);
 	write_mac(0x1, APPNIC_TX_MODE);
-	if (is_asic())
-		write_mac(0x300a, APPNIC_TX_WATERMARK);
-	else
-		write_mac(0xc00096, APPNIC_TX_WATERMARK);
+#if 1
+	write_mac(0x300a, APPNIC_TX_WATERMARK);
+#else
+	write_mac(0xc00096, APPNIC_TX_WATERMARK);
+#endif
 	write_mac(0x1, APPNIC_TX_HALF_DUPLEX_CONF);
 	write_mac(0xffff, APPNIC_TX_TIME_VALUE_CONF);
 	write_mac(0x1, APPNIC_TX_INTERRUPT_CONTROL);
-- 
1.8.3.4