aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi
diff options
context:
space:
mode:
authorDavid Spinadel <david.spinadel@intel.com>2014-10-26 09:53:27 -0400
committerEmmanuel Grumbach <emmanuel.grumbach@intel.com>2014-10-29 08:13:46 -0400
commit1e2ebe0e407159ae94974a93264260883f9a39ad (patch)
tree62d0ce4c226a5a381eadbee65aadfd57b0285955 /drivers/net/wireless/iwlwifi
parentaadede6e9f4c8ee46808b2f697b714ee50810e23 (diff)
iwlwifi: mvm: fix scan condition iterator
Scan condition iterator assumes that an interface is associated if phy_ctxt is assigned, but this isn't the sutuation in P2P device. OTOH P2P device is never associated so we can simply ignore it. Signed-off-by: David Spinadel <david.spinadel@intel.com> Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi')
-rw-r--r--drivers/net/wireless/iwlwifi/mvm/scan.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/scan.c b/drivers/net/wireless/iwlwifi/mvm/scan.c
index 64c02a274f76..042fcdc81f41 100644
--- a/drivers/net/wireless/iwlwifi/mvm/scan.c
+++ b/drivers/net/wireless/iwlwifi/mvm/scan.c
@@ -270,7 +270,8 @@ static void iwl_mvm_scan_condition_iterator(void *data, u8 *mac,
270 struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif); 270 struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);
271 bool *global_bound = data; 271 bool *global_bound = data;
272 272
273 if (mvmvif->phy_ctxt && mvmvif->phy_ctxt->id < MAX_PHYS) 273 if (vif->type != NL80211_IFTYPE_P2P_DEVICE && mvmvif->phy_ctxt &&
274 mvmvif->phy_ctxt->id < MAX_PHYS)
274 *global_bound = true; 275 *global_bound = true;
275} 276}
276 277