From d835d6021650b4c9dc4b6eebac47cd7da9f9f7a5 Mon Sep 17 00:00:00 2001 From: Jitendra Kalsaria Date: Tue, 10 Jul 2012 14:57:34 +0000 Subject: [PATCH] --- yaml --- r: 315107 b: refs/heads/master c: 849bcaff80d81d4c4c21935ce989008001447a05 h: refs/heads/master i: 315105: ecf443fb921792ef820210ce8a6d2944a6fdc4c4 315103: 73ad41c3b5cfa4eb97204e5423bef1918ca2a3c7 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/qlogic/qlge/qlge_ethtool.c | 9 --------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 677bdedbe202..bbf13a682b95 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 206d78e0c5e9eff0b025e54ff2825d90a0df77db +refs/heads/master: 849bcaff80d81d4c4c21935ce989008001447a05 diff --git a/trunk/drivers/net/ethernet/qlogic/qlge/qlge_ethtool.c b/trunk/drivers/net/ethernet/qlogic/qlge/qlge_ethtool.c index c2adfa26906d..3b0912fb53ab 100644 --- a/trunk/drivers/net/ethernet/qlogic/qlge/qlge_ethtool.c +++ b/trunk/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) static int ql_set_wol(struct net_device *ndev, struct ethtool_wolinfo *wol) { struct ql_adapter *qdev = netdev_priv(ndev); - int status; unsigned short ssys_dev = qdev->pdev->subsystem_device; /* WOL is only supported for mezz card. */ @@ -416,14 +415,6 @@ static int ql_set_wol(struct net_device *ndev, struct ethtool_wolinfo *wol) qdev->wol = wol->wolopts; netif_info(qdev, drv, qdev->ndev, "Set wol option 0x%x\n", qdev->wol); - if (!qdev->wol) { - u32 wol = 0; - status = ql_mb_wol_mode(qdev, wol); - netif_err(qdev, drv, qdev->ndev, "WOL %s (wol code 0x%x)\n", - status == 0 ? "cleared successfully" : "clear failed", - wol); - } - return 0; }