From 71d00f92fa215be8ae726847e4c1f9305ae62712 Mon Sep 17 00:00:00 2001
From: dholland <dholland@NetBSD.org>
Date: Fri, 26 Nov 2010 21:59:49 +0000
Subject: [PATCH] Don't test flags with &&. From Henning Petersen in PR 44151.

---
 sys/dev/pci/if_bnx.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sys/dev/pci/if_bnx.c b/sys/dev/pci/if_bnx.c
index 8edba9becf11..7f2544c95df0 100644
--- a/sys/dev/pci/if_bnx.c
+++ b/sys/dev/pci/if_bnx.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_bnx.c,v 1.33 2010/04/05 07:20:25 joerg Exp $	*/
+/*	$NetBSD: if_bnx.c,v 1.34 2010/11/26 21:59:49 dholland Exp $	*/
 /*	$OpenBSD: if_bnx.c,v 1.85 2009/11/09 14:32:41 dlg Exp $ */
 
 /*-
@@ -35,7 +35,7 @@
 #if 0
 __FBSDID("$FreeBSD: src/sys/dev/bce/if_bce.c,v 1.3 2006/04/13 14:12:26 ru Exp $");
 #endif
-__KERNEL_RCSID(0, "$NetBSD: if_bnx.c,v 1.33 2010/04/05 07:20:25 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bnx.c,v 1.34 2010/11/26 21:59:49 dholland Exp $");
 
 /*
  * The following controllers are supported by this driver:
@@ -1996,7 +1996,7 @@ bnx_get_media(struct bnx_softc *sc)
 	} else if (BNX_CHIP_BOND_ID(sc) & BNX_CHIP_BOND_ID_SERDES_BIT)
 		sc->bnx_phy_flags |= BNX_PHY_SERDES_FLAG;
 
-	if (sc->bnx_phy_flags && BNX_PHY_SERDES_FLAG) {
+	if (sc->bnx_phy_flags & BNX_PHY_SERDES_FLAG) {
 		u_int32_t val;
  
 		sc->bnx_flags |= BNX_NO_WOL_FLAG;