svn commit: r245153 - stable/9/sys/dev/ale

Pyun YongHyeon yongari at FreeBSD.org
Tue Jan 8 05:34:17 UTC 2013


Author: yongari
Date: Tue Jan  8 05:34:17 2013
New Revision: 245153
URL: http://svnweb.freebsd.org/changeset/base/245153

Log:
  MFC r244341:
    Make sure to stop both TX and RX MACs in ale_stop_mac(). Previously
    it used to stop TX MAC only such that MAC reconfiguration after
    getting a link didn't work as expected.
  
    PR:	kern/173652

Modified:
  stable/9/sys/dev/ale/if_ale.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/dev/   (props changed)

Modified: stable/9/sys/dev/ale/if_ale.c
==============================================================================
--- stable/9/sys/dev/ale/if_ale.c	Tue Jan  8 05:30:45 2013	(r245152)
+++ stable/9/sys/dev/ale/if_ale.c	Tue Jan  8 05:34:17 2013	(r245153)
@@ -2932,7 +2932,7 @@ ale_stop_mac(struct ale_softc *sc)
 
 	reg = CSR_READ_4(sc, ALE_MAC_CFG);
 	if ((reg & (MAC_CFG_TX_ENB | MAC_CFG_RX_ENB)) != 0) {
-		reg &= ~MAC_CFG_TX_ENB | MAC_CFG_RX_ENB;
+		reg &= ~(MAC_CFG_TX_ENB | MAC_CFG_RX_ENB);
 		CSR_WRITE_4(sc, ALE_MAC_CFG, reg);
 	}
 


More information about the svn-src-all mailing list