Return-path: Received: from mms3.broadcom.com ([216.31.210.19]:3292 "EHLO mms3.broadcom.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752500Ab3FEH76 (ORCPT ); Wed, 5 Jun 2013 03:59:58 -0400 From: "Arend van Spriel" To: "John W. Linville" cc: linux-wireless@vger.kernel.org, "David Miller" , "Arend van Spriel" Subject: [PATCH] brcmsmac: disable power-save related functions Date: Wed, 5 Jun 2013 09:59:45 +0200 Message-ID: <1370419185-3977-1-git-send-email-arend@broadcom.com> (sfid-20130605_100001_528731_7E0BACAA) MIME-Version: 1.0 Content-Type: text/plain Sender: linux-wireless-owner@vger.kernel.org List-ID: This patch fixes a regression introduced by: commit 6da3b6c48d79da96a36c2632053cf4f53bf48fb2 Author: Hauke Mehrtens Date: Sun Mar 24 01:45:52 2013 +0100 brcmsmac: remove brcms_bss_cfg->associated The regression behaviour is described in: http://www.spinics.net/lists/linux-wireless/msg107474.html Before the mentioned commit the return value of the function brcms_c_ps_allowed() was always false, which is desired behaviour as power-save is not supported at the moment. Therefor, the function is changed to just return false instead of simply reverting the mentioned commit. Signed-off-by: Arend van Spriel --- Sorry, John Hope the revised commit message has all the needed information now. Without this patch brcmsmac is useless for anyone using it in station mode. Gr. AvS --- drivers/net/wireless/brcm80211/brcmsmac/main.c | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/drivers/net/wireless/brcm80211/brcmsmac/main.c b/drivers/net/wireless/brcm80211/brcmsmac/main.c index 28e7aee..9fd6f2f 100644 --- a/drivers/net/wireless/brcm80211/brcmsmac/main.c +++ b/drivers/net/wireless/brcm80211/brcmsmac/main.c @@ -3074,21 +3074,8 @@ static void brcms_b_antsel_set(struct brcms_hardware *wlc_hw, u32 antsel_avail) */ static bool brcms_c_ps_allowed(struct brcms_c_info *wlc) { - /* disallow PS when one of the following global conditions meets */ - if (!wlc->pub->associated) - return false; - - /* disallow PS when one of these meets when not scanning */ - if (wlc->filter_flags & FIF_PROMISC_IN_BSS) - return false; - - if (wlc->bsscfg->type == BRCMS_TYPE_AP) - return false; - - if (wlc->bsscfg->type == BRCMS_TYPE_ADHOC) - return false; - - return true; + /* not supporting PS so always return false for now */ + return false; } static void brcms_c_statsupd(struct brcms_c_info *wlc) -- 1.7.10.4