projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6ecd09d
)
qlge: fix an "&&" vs "||" bug
author
Dan Carpenter
<
[email protected]
>
Thu, 12 Jul 2012 04:47:03 +0000
(
04:47
+0000)
committer
David S. Miller
<
[email protected]
>
Wed, 18 Jul 2012 16:40:53 +0000
(09:40 -0700)
The condition is always true so WOL will never work.
Signed-off-by: Dan Carpenter <
[email protected]
>
Acked-by: Jitendra Kalsaria <
[email protected]
>
Signed-off-by: David S. Miller <
[email protected]
>
drivers/net/ethernet/qlogic/qlge/qlge_ethtool.c
patch
|
blob
|
history
diff --git
a/drivers/net/ethernet/qlogic/qlge/qlge_ethtool.c
b/drivers/net/ethernet/qlogic/qlge/qlge_ethtool.c
index 3d4462bd9de7c5922155bfc3f69ac78661067338..6f316ab23257dc7343776d92db05cc471561d681 100644
(file)
--- 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");