| Message ID | 20120712144702.GB24202@elgon.mountain |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
-----Original Message----- >From: Dan Carpenter [mailto:dan.carpenter@oracle.com] >Sent: Thursday, July 12, 2012 7:47 AM >To: Anirban Chakraborty >Cc: Jitendra Kalsaria; Ron Mercer; Dept-Eng Linux Driver; netdev; kernel-janitors@vger.kernel.org >Subject: [patch] qlge: fix an "&&" vs "||" bug > >The condition is always true so WOL will never work. > >Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> > >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"); Acked-by: Jitendra Kalsaria <jitendra.kalsaria@qlogic.com> -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Jitendra Kalsaria <jitendra.kalsaria@qlogic.com> Date: Thu, 12 Jul 2012 11:15:56 -0700 > -----Original Message----- >>From: Dan Carpenter [mailto:dan.carpenter@oracle.com] >>Sent: Thursday, July 12, 2012 7:47 AM >>To: Anirban Chakraborty >>Cc: Jitendra Kalsaria; Ron Mercer; Dept-Eng Linux Driver; netdev; kernel-janitors@vger.kernel.org >>Subject: [patch] 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> Applied. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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");
The condition is always true so WOL will never work. Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html