]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
iwlwifi: mvm: pass force_assoc_off all the way down to avoid hacks
authorLuciano Coelho <luciano.coelho@intel.com>
Tue, 13 May 2014 14:33:38 +0000 (17:33 +0300)
committerEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Wed, 21 May 2014 09:52:44 +0000 (12:52 +0300)
commitbca49d9a220b2f277f8e6000ac3a9d129d88972c
treeda1e6641002697b6caf2fcd7ceaa5af490a38510
parentfa7b2e7fd09f17c47ac312ade3aae48247a528f6
iwlwifi: mvm: pass force_assoc_off all the way down to avoid hacks

In some cases, we need to force the association to be off in the
MAC_CONTEXT_CMD command we send to the firmware.  Instead of having to
hack the vif->bss_conf.assoc value, pass it all the way down the call
chain.

Additionally, for the iwl_mvm_mac_ctxt_add() case, we *always* set
forced_assoc_off to true, so we can remove the hack in the d3 code
that was forcing it to off by hacking the bss_conf.assoc value.

Signed-off-by: Luciano Coelho <luciano.coelho@intel.com>
Reviewed-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
drivers/net/wireless/iwlwifi/mvm/d3.c
drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c
drivers/net/wireless/iwlwifi/mvm/mac80211.c
drivers/net/wireless/iwlwifi/mvm/mvm.h