diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-04-25 10:04:22 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-04-25 10:04:22 +0200 |
| commit | 42ebd27bcbda7895fa07c61185a26d8379945ed0 (patch) | |
| tree | 51be64b0c2c0defd1a0ce3e6d55452dbd8a7aaae /drivers/net/wireless/iwlwifi/mvm/sf.c | |
| parent | a81fef347b32dea2b31275826afe1c93fa0d2d54 (diff) | |
| parent | 9f7ff8931e3c5ddc8535476971ec9501e9555c05 (diff) | |
| download | blackbird-op-linux-42ebd27bcbda7895fa07c61185a26d8379945ed0.tar.gz blackbird-op-linux-42ebd27bcbda7895fa07c61185a26d8379945ed0.zip | |
Merge branch 'perf/urgent' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/mvm/sf.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/mvm/sf.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/sf.c b/drivers/net/wireless/iwlwifi/mvm/sf.c index 8401627c0030..88809b2d1654 100644 --- a/drivers/net/wireless/iwlwifi/mvm/sf.c +++ b/drivers/net/wireless/iwlwifi/mvm/sf.c @@ -274,7 +274,8 @@ int iwl_mvm_sf_update(struct iwl_mvm *mvm, struct ieee80211_vif *changed_vif, return -EINVAL; if (changed_vif->type != NL80211_IFTYPE_STATION) { new_state = SF_UNINIT; - } else if (changed_vif->bss_conf.assoc) { + } else if (changed_vif->bss_conf.assoc && + changed_vif->bss_conf.dtim_period) { mvmvif = iwl_mvm_vif_from_mac80211(changed_vif); sta_id = mvmvif->ap_sta_id; new_state = SF_FULL_ON; |
