diff options
| author |   John W. Linville <linville@tuxdriver.com> | 2014-05-08 11:13:41 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-05-08 11:13:41 -0400 |
| commit | 6153871f77f8fa778cd0cf1e2979db75e25d3532 (patch) | |
| tree | c6024da3b1ee5ce379b3c60824aabba76a1e1799 /net/mac80211/sta_info.c | |
| parent | net: mdio: of_mdiobus_register(): fall back to mdiobus_register() for !CONFIG_OF (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211 (diff) | |
| download | linux-dev-6153871f77f8fa778cd0cf1e2979db75e25d3532.tar.xz linux-dev-6153871f77f8fa778cd0cf1e2979db75e25d3532.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
Diffstat (limited to 'net/mac80211/sta_info.c')
| -rw-r--r-- | net/mac80211/sta_info.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c index 137a192e64bc..847d92f6bef6 100644 --- a/net/mac80211/sta_info.c +++ b/net/mac80211/sta_info.c @@ -1148,7 +1148,8 @@ void ieee80211_sta_ps_deliver_wakeup(struct sta_info *sta) atomic_dec(&ps->num_sta_ps); /* This station just woke up and isn't aware of our SMPS state */ - if (!ieee80211_smps_is_restrictive(sta->known_smps_mode, + if (!ieee80211_vif_is_mesh(&sdata->vif) && + !ieee80211_smps_is_restrictive(sta->known_smps_mode, sdata->smps_mode) && sta->known_smps_mode != sdata->bss->req_smps && sta_info_tx_streams(sta) != 1) { |