From patchwork Tue Nov 10 02:04:13 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bing Zhao X-Patchwork-Id: 58916 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id nAA0fIs8022789 for ; Tue, 10 Nov 2009 00:41:18 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753189AbZKJAlI (ORCPT ); Mon, 9 Nov 2009 19:41:08 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752860AbZKJAlI (ORCPT ); Mon, 9 Nov 2009 19:41:08 -0500 Received: from dakia2.marvell.com ([65.219.4.35]:51577 "EHLO dakia2.marvell.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751016AbZKJAlG (ORCPT ); Mon, 9 Nov 2009 19:41:06 -0500 X-ASG-Debug-ID: 1257813671-3c4300500000-9xRsGE X-Barracuda-URL: http://10.68.76.222:80/cgi-bin/mark.cgi Received: from maili.marvell.com (maili.marvell.com [10.68.76.51]) by dakia2.marvell.com (Spam & Virus Firewall) with ESMTP id 96D221411A0; Mon, 9 Nov 2009 16:41:11 -0800 (PST) Received: from maili.marvell.com (maili.marvell.com [10.68.76.51]) by dakia2.marvell.com with ESMTP id IgD4xw6FZ7K5a2g2; Mon, 09 Nov 2009 16:41:11 -0800 (PST) Received: from localhost.localdomain (unknown [10.82.24.199]) by maili.marvell.com (Postfix) with ESMTP id 7CF057ED77; Mon, 9 Nov 2009 16:41:11 -0800 (PST) From: Bing Zhao To: libertas-dev@lists.infradead.org Cc: linux-wireless@vger.kernel.org, Bing Zhao , Amitkumar Karwar X-ASG-Orig-Subj: [PATCH 2/2] Libertas: fix issues while configuring host sleep using ethtool wol Subject: [PATCH 2/2] Libertas: fix issues while configuring host sleep using ethtool wol Date: Mon, 9 Nov 2009 18:04:13 -0800 Message-Id: <1257818653-13460-2-git-send-email-bzhao@marvell.com> X-Mailer: git-send-email 1.5.3.6 In-Reply-To: <1257818653-13460-1-git-send-email-bzhao@marvell.com> References: <1257818653-13460-1-git-send-email-bzhao@marvell.com> X-Barracuda-Connect: maili.marvell.com[10.68.76.51] X-Barracuda-Start-Time: 1257813671 X-Barracuda-Virus-Scanned: by dakia2.marvell.com at marvell.com X-Barracuda-Spam-Score: -1002.00 X-Barracuda-Spam-Status: No, SCORE=-1002.00 using global scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=1000.0 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org diff --git a/drivers/net/wireless/libertas/ethtool.c b/drivers/net/wireless/libertas/ethtool.c index 6efa388..53d56ab 100644 --- a/drivers/net/wireless/libertas/ethtool.c +++ b/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); }