[PATCH] e100: incorrect use of "&&" instead of "&"

[Willy Tarreau]

In e100_do_ethtool_ioctl(), bdp->flags is a bitfield and is
checked for some bits but the AND operation is performed with
&& instead of &. Obvious fix is to use "&" as in all other
places. 2.6 does not seem affected.

Signed-off-by: Willy Tarreau <w@xxxxxx>
---
 drivers/net/e100/e100_main.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/e100/e100_main.c b/drivers/net/e100/e100_main.c
index c9d801a..d67a145 100644
--- a/drivers/net/e100/e100_main.c
+++ b/drivers/net/e100/e100_main.c
@@ -3292,11 +3292,11 @@ #ifdef	ETHTOOL_GPAUSEPARAM
 		if ((bdp->flags & IS_BACHELOR)
 		    && (bdp->params.b_params & PRM_FC)) {
 			epause.autoneg = 1;
-			if (bdp->flags && DF_LINK_FC_CAP) {
+			if (bdp->flags & DF_LINK_FC_CAP) {
 				epause.rx_pause = 1;
 				epause.tx_pause = 1;
 			}
-			if (bdp->flags && DF_LINK_FC_TX_ONLY)
+			if (bdp->flags & DF_LINK_FC_TX_ONLY)
 				epause.tx_pause = 1;
 		}
 		rc = copy_to_user(ifr->ifr_data, &epause, sizeof(epause))
-- 
1.4.2.4

-
To unsubscribe from this list: send the line "unsubscribe linux-net" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html