summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2012-07-12 04:47:03 +0000
committerDavid S. Miller <davem@davemloft.net>2012-07-18 09:40:53 -0700
commit7be7e93268447cbb42fa0e6939b6372c156a1ad5 (patch)
treeb1ae35eb3cf1c6fd798eee95824df6d5a2a0d44f /drivers
parent6ecd09dd35fd07b8f2f6f5210ecffd4cc5ac0581 (diff)
downloadlinux-stable-7be7e93268447cbb42fa0e6939b6372c156a1ad5.tar.gz
linux-stable-7be7e93268447cbb42fa0e6939b6372c156a1ad5.tar.bz2
linux-stable-7be7e93268447cbb42fa0e6939b6372c156a1ad5.zip
qlge: fix an "&&" vs "||" bug
The condition is always true so WOL will never work. Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Acked-by: Jitendra Kalsaria <jitendra.kalsaria@qlogic.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/ethernet/qlogic/qlge/qlge_ethtool.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/qlogic/qlge/qlge_ethtool.c b/drivers/net/ethernet/qlogic/qlge/qlge_ethtool.c
index 3d4462bd9de7..6f316ab23257 100644
--- a/drivers/net/ethernet/qlogic/qlge/qlge_ethtool.c
+++ b/drivers/net/ethernet/qlogic/qlge/qlge_ethtool.c
@@ -440,7 +440,7 @@ static int ql_set_wol(struct net_device *ndev, struct ethtool_wolinfo *wol)
unsigned short ssys_dev = qdev->pdev->subsystem_device;
/* WOL is only supported for mezz card. */
- if (ssys_dev != QLGE_MEZZ_SSYS_ID_068 ||
+ if (ssys_dev != QLGE_MEZZ_SSYS_ID_068 &&
ssys_dev != QLGE_MEZZ_SSYS_ID_180) {
netif_info(qdev, drv, qdev->ndev,
"WOL is only supported for mezz card\n");