From patchwork Thu Jul 8 14:50:05 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luciano Coelho X-Patchwork-Id: 110870 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o68EoZtV025785 for ; Thu, 8 Jul 2010 14:50:36 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755364Ab0GHOue (ORCPT ); Thu, 8 Jul 2010 10:50:34 -0400 Received: from smtp.nokia.com ([192.100.122.233]:40347 "EHLO mgw-mx06.nokia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754241Ab0GHOub (ORCPT ); Thu, 8 Jul 2010 10:50:31 -0400 Received: from vaebh106.NOE.Nokia.com (vaebh106.europe.nokia.com [10.160.244.32]) by mgw-mx06.nokia.com (Switch-3.3.3/Switch-3.3.3) with ESMTP id o68Eo9TO016337; Thu, 8 Jul 2010 17:50:18 +0300 Received: from esebh102.NOE.Nokia.com ([172.21.138.183]) by vaebh106.NOE.Nokia.com with Microsoft SMTPSVC(6.0.3790.4675); Thu, 8 Jul 2010 17:50:12 +0300 Received: from mgw-sa01.ext.nokia.com ([147.243.1.47]) by esebh102.NOE.Nokia.com over TLS secured channel with Microsoft SMTPSVC(6.0.3790.4675); Thu, 8 Jul 2010 17:50:11 +0300 Received: from localhost.localdomain (chilepepper.research.nokia.com [172.21.50.167]) by mgw-sa01.ext.nokia.com (Switch-3.3.3/Switch-3.3.3) with ESMTP id o68Eo8dI005922; Thu, 8 Jul 2010 17:50:11 +0300 From: Luciano Coelho To: linville@tuxdriver.com Cc: linux-wireless@vger.kernel.org, Juuso Oikarinen Subject: [PATCH 10/13] wl1271: Update interface to temporarily disable dynamic PS Date: Thu, 8 Jul 2010 17:50:05 +0300 Message-Id: <1278600608-22411-11-git-send-email-luciano.coelho@nokia.com> X-Mailer: git-send-email 1.6.3.3 In-Reply-To: <1278600608-22411-1-git-send-email-luciano.coelho@nokia.com> References: <1278600608-22411-1-git-send-email-luciano.coelho@nokia.com> X-OriginalArrivalTime: 08 Jul 2010 14:50:11.0931 (UTC) FILETIME=[DE14E2B0:01CB1EAC] X-Nokia-AV: Clean Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Thu, 08 Jul 2010 14:50:36 +0000 (UTC) diff --git a/drivers/net/wireless/wl12xx/wl1271_event.c b/drivers/net/wireless/wl12xx/wl1271_event.c index 525ba1a..2d60d22 100644 --- a/drivers/net/wireless/wl12xx/wl1271_event.c +++ b/drivers/net/wireless/wl12xx/wl1271_event.c @@ -229,9 +229,9 @@ static int wl1271_event_process(struct wl1271 *wl, struct event_mailbox *mbox) if (vector & SOFT_GEMINI_SENSE_EVENT_ID && wl->bss_type == BSS_TYPE_STA_BSS) { if (mbox->soft_gemini_sense_info) - ieee80211_disable_dyn_ps(wl->vif, true); + ieee80211_disable_dyn_ps(wl->vif); else - ieee80211_disable_dyn_ps(wl->vif, false); + ieee80211_enable_dyn_ps(wl->vif); } /* diff --git a/drivers/net/wireless/wl12xx/wl1271_main.c b/drivers/net/wireless/wl12xx/wl1271_main.c index d50c0a9..70c6b0d 100644 --- a/drivers/net/wireless/wl12xx/wl1271_main.c +++ b/drivers/net/wireless/wl12xx/wl1271_main.c @@ -939,7 +939,7 @@ static void wl1271_op_remove_interface(struct ieee80211_hw *hw, /* enable dyn ps just in case (if left on due to fw crash etc) */ if (wl->bss_type == BSS_TYPE_STA_BSS) - ieee80211_disable_dyn_ps(wl->vif, false); + ieee80211_enable_dyn_ps(wl->vif); if (test_and_clear_bit(WL1271_FLAG_SCANNING, &wl->flags)) { mutex_unlock(&wl->mutex); @@ -1779,7 +1779,7 @@ static void wl1271_op_bss_info_changed(struct ieee80211_hw *hw, wl->aid = 0; /* re-enable dynamic ps - just in case */ - ieee80211_disable_dyn_ps(wl->vif, false); + ieee80211_enable_dyn_ps(wl->vif); /* revert back to minimum rates for the current band */ wl1271_set_band_rate(wl);