From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mail-ww0-f42.google.com ([74.125.82.42]:54949 "EHLO mail-ww0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757661Ab1F0KGl (ORCPT ); Mon, 27 Jun 2011 06:06:41 -0400 Received: by wwg11 with SMTP id 11so1965449wwg.1 for ; Mon, 27 Jun 2011 03:06:40 -0700 (PDT) From: Eliad Peller To: Luciano Coelho Cc: Subject: [PATCH v2 1/3] wl12xx: configure suspend/resume only if associated/started Date: Mon, 27 Jun 2011 13:06:43 +0300 Message-Id: <1309169205-27966-1-git-send-email-eliad@wizery.com> (sfid-20110627_121213_948673_5CFE203F) Sender: linux-wireless-owner@vger.kernel.org List-ID: Configure the device (to wowlan) only if the sta/ap is associated/started. Signed-off-by: Eliad Peller --- drivers/net/wireless/wl12xx/main.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/wl12xx/main.c b/drivers/net/wireless/wl12xx/main.c index 2c2251a..7017c23 100644 --- a/drivers/net/wireless/wl12xx/main.c +++ b/drivers/net/wireless/wl12xx/main.c @@ -1469,10 +1469,13 @@ static struct notifier_block wl1271_dev_notifier = { static int wl1271_configure_suspend_sta(struct wl1271 *wl) { - int ret; + int ret = 0; mutex_lock(&wl->mutex); + if (!test_bit(WL1271_FLAG_STA_ASSOCIATED, &wl->flags)) + goto out_unlock; + ret = wl1271_ps_elp_wakeup(wl); if (ret < 0) goto out_unlock; @@ -1517,10 +1520,13 @@ out: static int wl1271_configure_suspend_ap(struct wl1271 *wl) { - int ret; + int ret = 0; mutex_lock(&wl->mutex); + if (!test_bit(WL1271_FLAG_AP_STARTED, &wl->flags)) + goto out_unlock; + ret = wl1271_ps_elp_wakeup(wl); if (ret < 0) goto out_unlock; -- 1.7.0.4