From 7be7e93268447cbb42fa0e6939b6372c156a1ad5 Mon Sep 17 00:00:00 2001 From: Dan Carpenter <dan.carpenter@oracle.com> Date: Thu, 12 Jul 2012 04:47:03 +0000 Subject: 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> --- drivers/net/ethernet/qlogic/qlge/qlge_ethtool.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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"); -- cgit v1.2.3