svn commit: r185161 - in stable/7/sys: . dev/bce modules/cxgb

[Xin LI]

Author: delphij
Date: Sat Nov 22 01:48:20 2008
New Revision: 185161
URL: http://svn.freebsd.org/changeset/base/185161

Log:
  MFC r185082:
  
  Correct a logic error when testing BCE_PHY_SERDES_FLAG.
  
  PR:		kern/128801
  Pointed out by:	Adam Morrison
  Ok'ed by:	davidch
  Approved by:	re (kensmith)

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/dev/bce/if_bce.c
  stable/7/sys/modules/cxgb/   (props changed)

Modified: stable/7/sys/dev/bce/if_bce.c
==============================================================================
--- stable/7/sys/dev/bce/if_bce.c	Sat Nov 22 01:35:59 2008	(r185160)
+++ stable/7/sys/dev/bce/if_bce.c	Sat Nov 22 01:48:20 2008	(r185161)
@@ -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;