svn commit: r185082 - head/sys/dev/bce

Xin LI delphij at FreeBSD.org
Tue Nov 18 19:24:36 PST 2008


Author: delphij
Date: Wed Nov 19 03:24:35 2008
New Revision: 185082
URL: http://svn.freebsd.org/changeset/base/185082

Log:
  Correct a logic error when testing BCE_PHY_SERDES_FLAG.
  
  PR:		kern/128801
  Pointed out by:	Adam Morrison
  Ok'ed by:	davidch
  MFC after:	3 days

Modified:
  head/sys/dev/bce/if_bce.c

Modified: head/sys/dev/bce/if_bce.c
==============================================================================
--- head/sys/dev/bce/if_bce.c	Wed Nov 19 03:14:41 2008	(r185081)
+++ head/sys/dev/bce/if_bce.c	Wed Nov 19 03:24:35 2008	(r185082)
@@ -2555,7 +2555,7 @@ bce_get_media(struct bce_softc *sc)
 	} else if (BCE_CHIP_BOND_ID(sc) & BCE_CHIP_BOND_ID_SERDES_BIT)
 		sc->bce_phy_flags |= BCE_PHY_SERDES_FLAG;
 
-	if (sc->bce_phy_flags && BCE_PHY_SERDES_FLAG) {
+	if (sc->bce_phy_flags & BCE_PHY_SERDES_FLAG) {
 		sc->bce_flags |= BCE_NO_WOL_FLAG;
 		if (BCE_CHIP_NUM(sc) != BCE_CHIP_NUM_5706) {
 			sc->bce_phy_addr = 2;


More information about the svn-src-head mailing list