svn commit: r199240 - head/sys/dev/cxgb

[Navdeep Parhar]

Author: np
Date: Fri Nov 13 00:37:29 2009
New Revision: 199240
URL: http://svn.freebsd.org/changeset/base/199240

Log:
  Don't disable the XGMAC's tx on ifconfig down.  It is unnecessary
  and can cause false backpressure in the chip.  Fix a us/ms mixup
  while here.

Modified:
  head/sys/dev/cxgb/cxgb_main.c

Modified: head/sys/dev/cxgb/cxgb_main.c
==============================================================================
--- head/sys/dev/cxgb/cxgb_main.c	Fri Nov 13 00:34:28 2009	(r199239)
+++ head/sys/dev/cxgb/cxgb_main.c	Fri Nov 13 00:37:29 2009	(r199240)
@@ -1982,14 +1982,14 @@ cxgb_uninit_synchronized(struct port_inf
 	t3_set_reg_field(sc, A_XGM_RXFIFO_CFG +  pi->mac.offset,
 			 V_RXFIFOPAUSEHWM(M_RXFIFOPAUSEHWM), 0);
 
-	DELAY(100);
+	DELAY(100 * 1000);
 
 	/* Wait for TXFIFO empty */
 	t3_wait_op_done(sc, A_XGM_TXFIFO_CFG + pi->mac.offset,
 			F_TXFIFO_EMPTY, 1, 20, 5);
 
-	DELAY(100);
-	t3_mac_disable(&pi->mac, MAC_DIRECTION_TX | MAC_DIRECTION_RX);
+	DELAY(100 * 1000);
+	t3_mac_disable(&pi->mac, MAC_DIRECTION_RX);
 
 
 	pi->phy.ops->power_down(&pi->phy, 1);