diff options
author | Johannes Berg <johannes.berg@intel.com> | 2010-04-13 04:04:33 -0400 |
---|---|---|
committer | Reinette Chatre <reinette.chatre@intel.com> | 2010-04-16 16:54:06 -0400 |
commit | fa58b6a3b34944bb9fc0129ba2534bd91d082d61 (patch) | |
tree | 35317378ff0288e6e4c6a8bb6a4929951599b493 /drivers/net/wireless/iwlwifi/iwl-core.c | |
parent | b2e8690d5a4d1868ee12f50aa00c138bec985b3c (diff) |
iwlwifi: don't check monitor for scanning
Monitor mode operation need not (and probably should
not) affect scanning this way since real monitoring
can not properly happen while scanning anyway.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-core.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-core.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c index aa86ef9fb426..d282bef5d7ea 100644 --- a/drivers/net/wireless/iwlwifi/iwl-core.c +++ b/drivers/net/wireless/iwlwifi/iwl-core.c | |||
@@ -834,11 +834,10 @@ static u8 iwl_count_chain_bitmap(u32 chain_bitmap) | |||
834 | * never called for monitor mode. The only way mac80211 informs us about | 834 | * never called for monitor mode. The only way mac80211 informs us about |
835 | * monitor mode is through configuring filters (call to configure_filter). | 835 | * monitor mode is through configuring filters (call to configure_filter). |
836 | */ | 836 | */ |
837 | bool iwl_is_monitor_mode(struct iwl_priv *priv) | 837 | static bool iwl_is_monitor_mode(struct iwl_priv *priv) |
838 | { | 838 | { |
839 | return !!(priv->staging_rxon.filter_flags & RXON_FILTER_PROMISC_MSK); | 839 | return !!(priv->staging_rxon.filter_flags & RXON_FILTER_PROMISC_MSK); |
840 | } | 840 | } |
841 | EXPORT_SYMBOL(iwl_is_monitor_mode); | ||
842 | 841 | ||
843 | /** | 842 | /** |
844 | * iwl_set_rxon_chain - Set up Rx chain usage in "staging" RXON image | 843 | * iwl_set_rxon_chain - Set up Rx chain usage in "staging" RXON image |