From: jsg <jsg@openbsd.org>
Date: Tue, 3 Aug 2010 16:11:57 +0000 (+0000)
Subject: Correct use of logical and where binary and was intended.
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=80e239687578f723ebb9a678d7b22cc5eb3b7f43;p=openbsd

Correct use of logical and where binary and was intended.
Spotted by lint, but mirrors a similiar change in the
original FreeBSD code from over a year ago.

ok deraadt@
---

diff --git a/sys/dev/pci/if_bnx.c b/sys/dev/pci/if_bnx.c
index e87f892e282..8ff6db84058 100644
--- a/sys/dev/pci/if_bnx.c
+++ b/sys/dev/pci/if_bnx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_bnx.c,v 1.88 2010/05/24 21:23:23 sthen Exp $	*/
+/*	$OpenBSD: if_bnx.c,v 1.89 2010/08/03 16:11:57 jsg Exp $	*/
 
 /*-
  * Copyright (c) 2006 Broadcom Corporation
@@ -2227,7 +2227,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) {
 		sc->bnx_flags |= BNX_NO_WOL_FLAG;
 
 		if (BNX_CHIP_NUM(sc) == BNX_CHIP_NUM_5709)