summaryrefslogtreecommitdiff
path: root/drivers/net/wireless/iwlwifi/mvm/sf.c
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2014-04-17 18:34:22 +0400
committerJohn W. Linville <linville@tuxdriver.com>2014-04-17 18:34:22 +0400
commit4a0c3d9fd1af83ad0519997043467b817d3738fc (patch)
treec0ebcbe02a8d70ad6d0b3ebaed38711d0204b594 /drivers/net/wireless/iwlwifi/mvm/sf.c
parent0acf07d240a84069c4a6651e6030cf35d30c7159 (diff)
parentf8d2b9209ad648a8e9aa973d32fb64aa2ab01d00 (diff)
downloadlinux-4a0c3d9fd1af83ad0519997043467b817d3738fc.tar.xz
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
Diffstat (limited to 'drivers/net/wireless/iwlwifi/mvm/sf.c')
-rw-r--r--drivers/net/wireless/iwlwifi/mvm/sf.c3
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;