diff options
author | John W. Linville <linville@tuxdriver.com> | 2013-06-18 18:04:51 (GMT) |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2013-06-18 18:04:51 (GMT) |
commit | 9d1059c2481885ba7a2af02fc1bf87cae88b302a (patch) | |
tree | b9ff1d502017ea7939d26a99720801ffdbe2b3da /drivers/net/wireless/brcm80211 | |
parent | c4d827c5ccc3a49227dbf9d4b248a2e86f388023 (diff) | |
parent | fcb3701849957917a234a61b58ad70ed35c83eda (diff) | |
download | linux-fsl-qoriq-9d1059c2481885ba7a2af02fc1bf87cae88b302a.tar.xz |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Diffstat (limited to 'drivers/net/wireless/brcm80211')
-rw-r--r-- | drivers/net/wireless/brcm80211/brcmsmac/main.c | 17 |
1 files 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) |