diff options
author | Johannes Berg <johannes.berg@intel.com> | 2013-01-24 17:48:23 -0500 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2013-02-12 10:52:25 -0500 |
commit | 210a544e78c7ce4e5aa5ec199eeb807b0f03b5b2 (patch) | |
tree | 0afac8659a19ab3a93ae636ecb87da0c9c7afe17 /drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c | |
parent | 739e42f4f3fc5906db049b54e45498c7ab5bba81 (diff) |
iwlwifi: mvm: don't delay the association until after beacon
If we haven't heard a beacon before we associate we can
still start the association process and set the MAC in
the firmware to associated only after having received a
beacon with DTIM period by reacting to the new change
flag (BSS_CHANGED_DTIM_PERIOD) from mac80211.
This reduces the association time in these cases.
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c b/drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c index c08a17a3cab9..0854dc338881 100644 --- a/drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c +++ b/drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c | |||
@@ -584,7 +584,11 @@ static void iwl_mvm_mac_ctxt_cmd_fill_sta(struct iwl_mvm *mvm, | |||
584 | struct ieee80211_vif *vif, | 584 | struct ieee80211_vif *vif, |
585 | struct iwl_mac_data_sta *ctxt_sta) | 585 | struct iwl_mac_data_sta *ctxt_sta) |
586 | { | 586 | { |
587 | ctxt_sta->is_assoc = cpu_to_le32(vif->bss_conf.assoc ? 1 : 0); | 587 | /* We need the dtim_period to set the MAC as associated */ |
588 | if (vif->bss_conf.assoc && vif->bss_conf.dtim_period) | ||
589 | ctxt_sta->is_assoc = cpu_to_le32(1); | ||
590 | else | ||
591 | ctxt_sta->is_assoc = cpu_to_le32(0); | ||
588 | 592 | ||
589 | ctxt_sta->bi = cpu_to_le32(vif->bss_conf.beacon_int); | 593 | ctxt_sta->bi = cpu_to_le32(vif->bss_conf.beacon_int); |
590 | ctxt_sta->bi_reciprocal = | 594 | ctxt_sta->bi_reciprocal = |