diff options
author | Jitendra Kalsaria <jitendra.kalsaria@qlogic.com> | 2012-07-10 10:57:34 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-07-11 02:28:33 -0400 |
commit | 849bcaff80d81d4c4c21935ce989008001447a05 (patch) | |
tree | 883b2afdffaa4654afee780b67744a3ce2932439 | |
parent | 206d78e0c5e9eff0b025e54ff2825d90a0df77db (diff) |
qlge: Clean up ethtool set WOL routine.
Signed-off-by: Jitendra Kalsaria <jitendra.kalsaria@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/net/ethernet/qlogic/qlge/qlge_ethtool.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/net/ethernet/qlogic/qlge/qlge_ethtool.c b/drivers/net/ethernet/qlogic/qlge/qlge_ethtool.c index c2adfa26906d..3b0912fb53ab 100644 --- a/drivers/net/ethernet/qlogic/qlge/qlge_ethtool.c +++ b/drivers/net/ethernet/qlogic/qlge/qlge_ethtool.c | |||
@@ -401,7 +401,6 @@ static void ql_get_wol(struct net_device *ndev, struct ethtool_wolinfo *wol) | |||
401 | static int ql_set_wol(struct net_device *ndev, struct ethtool_wolinfo *wol) | 401 | static int ql_set_wol(struct net_device *ndev, struct ethtool_wolinfo *wol) |
402 | { | 402 | { |
403 | struct ql_adapter *qdev = netdev_priv(ndev); | 403 | struct ql_adapter *qdev = netdev_priv(ndev); |
404 | int status; | ||
405 | unsigned short ssys_dev = qdev->pdev->subsystem_device; | 404 | unsigned short ssys_dev = qdev->pdev->subsystem_device; |
406 | 405 | ||
407 | /* WOL is only supported for mezz card. */ | 406 | /* WOL is only supported for mezz card. */ |
@@ -416,14 +415,6 @@ static int ql_set_wol(struct net_device *ndev, struct ethtool_wolinfo *wol) | |||
416 | qdev->wol = wol->wolopts; | 415 | qdev->wol = wol->wolopts; |
417 | 416 | ||
418 | netif_info(qdev, drv, qdev->ndev, "Set wol option 0x%x\n", qdev->wol); | 417 | netif_info(qdev, drv, qdev->ndev, "Set wol option 0x%x\n", qdev->wol); |
419 | if (!qdev->wol) { | ||
420 | u32 wol = 0; | ||
421 | status = ql_mb_wol_mode(qdev, wol); | ||
422 | netif_err(qdev, drv, qdev->ndev, "WOL %s (wol code 0x%x)\n", | ||
423 | status == 0 ? "cleared successfully" : "clear failed", | ||
424 | wol); | ||
425 | } | ||
426 | |||
427 | return 0; | 418 | return 0; |
428 | } | 419 | } |
429 | 420 | ||