From: Dan Carpenter Date: Thu, 12 Jul 2012 04:47:03 +0000 (+0000) Subject: qlge: fix an "&&" vs "||" bug X-Git-Tag: v3.6-rc1~125^2~106 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7be7e93268447cbb42fa0e6939b6372c156a1ad5;p=profile%2Fivi%2Fkernel-x86-ivi.git qlge: fix an "&&" vs "||" bug The condition is always true so WOL will never work. Signed-off-by: Dan Carpenter Acked-by: Jitendra Kalsaria Signed-off-by: David S. Miller --- diff --git a/drivers/net/ethernet/qlogic/qlge/qlge_ethtool.c b/drivers/net/ethernet/qlogic/qlge/qlge_ethtool.c index 3d4462b..6f316ab 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");