From b38846a7e5dd5c8fc409a102855121e50fa69db2 Mon Sep 17 00:00:00 2001 From: Sascha Silbe Date: Sat, 5 Jun 2010 13:30:12 +0200 Subject: [PATCH] --- yaml --- r: 202887 b: refs/heads/master c: 84efa0e7aab9f41451bdf4bff5e2414bb59c6a93 h: refs/heads/master i: 202885: 7da3786e7b9307c2c039e4b946651cd57590511f 202883: cdc46e90f39987d1f311995784a5561c66155533 202879: ad9a13128f802d5af3852cb6111f072375ae525c v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/libertas/ethtool.c | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index ebaee5e7eb1e..b808ed98834c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a5fdbcad0a3f461d43f7b801f8fc176cd2840704 +refs/heads/master: 84efa0e7aab9f41451bdf4bff5e2414bb59c6a93 diff --git a/trunk/drivers/net/wireless/libertas/ethtool.c b/trunk/drivers/net/wireless/libertas/ethtool.c index 6a36c9956fdc..0cf31bbf6567 100644 --- a/trunk/drivers/net/wireless/libertas/ethtool.c +++ b/trunk/drivers/net/wireless/libertas/ethtool.c @@ -69,14 +69,11 @@ static void lbs_ethtool_get_wol(struct net_device *dev, { struct lbs_private *priv = dev->ml_priv; - if (priv->wol_criteria == 0xffffffff) { - /* Interface driver didn't configure wake */ - wol->supported = wol->wolopts = 0; - return; - } - wol->supported = WAKE_UCAST|WAKE_MCAST|WAKE_BCAST|WAKE_PHY; + if (priv->wol_criteria == EHS_REMOVE_WAKEUP) + return; + if (priv->wol_criteria & EHS_WAKE_ON_UNICAST_DATA) wol->wolopts |= WAKE_UCAST; if (priv->wol_criteria & EHS_WAKE_ON_MULTICAST_DATA)