Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[linux-beck.git] / drivers / net / ethernet / emulex / benet / be_ethtool.c

diff --git a/drivers/net/ethernet/emulex/benet/be_ethtool.c b/drivers/net/ethernet/emulex/benet/be_ethtool.c
index ec3050b3133e3946ea3d9062d8fdb611a4b13e79..5733cde88e2cccea3ea26fcf1a1a76ade95322ec 100644 (file)
--- a/drivers/net/ethernet/emulex/benet/be_ethtool.c
+++ b/drivers/net/ethernet/emulex/benet/be_ethtool.c
@@ -680,7 +680,8 @@ be_get_wol(struct net_device *netdev, struct ethtool_wolinfo *wol)
 
        if (be_is_wol_supported(adapter)) {
                wol->supported |= WAKE_MAGIC;
-               wol->wolopts |= WAKE_MAGIC;
+               if (adapter->wol)
+                       wol->wolopts |= WAKE_MAGIC;
        } else
                wol->wolopts = 0;
        memset(&wol->sopass, 0, sizeof(wol->sopass));