From 6877b9378501d2721142797e8b200b82e862d1af Mon Sep 17 00:00:00 2001 From: Bing Zhao Date: Mon, 9 Nov 2009 18:04:13 -0800 Subject: [PATCH] --- yaml --- r: 168731 b: refs/heads/master c: c3b866ad7ef9a74fc2e0d7f0c5520ad09c8536f3 h: refs/heads/master i: 168729: fcd6a8c30fe7100c53cad891379c9d21e37a9840 168727: efd0ba3b9299865ff6c35e7b62899688e1ab29d0 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/libertas/ethtool.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 9f1c1ec5bf90..3fdf15d3a403 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 866d4700150656b928f366c395bab9ab0e1a06a3 +refs/heads/master: c3b866ad7ef9a74fc2e0d7f0c5520ad09c8536f3 diff --git a/trunk/drivers/net/wireless/libertas/ethtool.c b/trunk/drivers/net/wireless/libertas/ethtool.c index 6efa3882d0a6..53d56ab83c03 100644 --- a/trunk/drivers/net/wireless/libertas/ethtool.c +++ b/trunk/drivers/net/wireless/libertas/ethtool.c @@ -169,9 +169,6 @@ static int lbs_ethtool_set_wol(struct net_device *dev, struct lbs_private *priv = dev->ml_priv; uint32_t criteria = 0; - if (priv->wol_criteria == 0xffffffff && wol->wolopts) - return -EOPNOTSUPP; - if (wol->wolopts & ~(WAKE_UCAST|WAKE_MCAST|WAKE_BCAST|WAKE_PHY)) return -EOPNOTSUPP; @@ -183,6 +180,8 @@ static int lbs_ethtool_set_wol(struct net_device *dev, criteria |= EHS_WAKE_ON_BROADCAST_DATA; if (wol->wolopts & WAKE_PHY) criteria |= EHS_WAKE_ON_MAC_EVENT; + if (wol->wolopts == 0) + criteria |= EHS_REMOVE_WAKEUP; return lbs_host_sleep_cfg(priv, criteria, (struct wol_config *)NULL); }