Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fa58b6a3 authored by Johannes Berg's avatar Johannes Berg Committed by Reinette Chatre
Browse files

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: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarReinette Chatre <reinette.chatre@intel.com>
parent b2e8690d

drivers/net/wireless/iwlwifi/iwl-agn-lib.c

+0 −2
Original line number Diff line number Diff line
@@ -1458,8 +1458,6 @@ void iwlagn_request_scan(struct iwl_priv *priv) 


	}

	scan->tx_cmd.len = cpu_to_le16(cmd_len);

	if (iwl_is_monitor_mode(priv))

		scan->filter_flags = RXON_FILTER_PROMISC_MSK;



	scan->filter_flags |= (RXON_FILTER_ACCEPT_GRP_MSK |

			       RXON_FILTER_BCON_AWARE_MSK);

drivers/net/wireless/iwlwifi/iwl-core.c

+1 −2
Original line number Diff line number Diff line
@@ -834,11 +834,10 @@ static u8 iwl_count_chain_bitmap(u32 chain_bitmap) 
 * never called for monitor mode. The only way mac80211 informs us about

 * monitor mode is through configuring filters (call to configure_filter).

 */

bool iwl_is_monitor_mode(struct iwl_priv *priv)

static bool iwl_is_monitor_mode(struct iwl_priv *priv)

{

	return !!(priv->staging_rxon.filter_flags & RXON_FILTER_PROMISC_MSK);

}

EXPORT_SYMBOL(iwl_is_monitor_mode);



/**

 * iwl_set_rxon_chain - Set up Rx chain usage in "staging" RXON image

drivers/net/wireless/iwlwifi/iwl-core.h

+0 −1
Original line number Diff line number Diff line
@@ -351,7 +351,6 @@ void iwl_configure_filter(struct ieee80211_hw *hw, 
			  unsigned int changed_flags,

			  unsigned int *total_flags, u64 multicast);

int iwl_set_hw_params(struct iwl_priv *priv);

bool iwl_is_monitor_mode(struct iwl_priv *priv);

void iwl_post_associate(struct iwl_priv *priv);

void iwl_bss_info_changed(struct ieee80211_hw *hw,

				     struct ieee80211_vif *vif,

drivers/net/wireless/iwlwifi/iwl3945-base.c

+0 −3
Original line number Diff line number Diff line
@@ -2963,9 +2963,6 @@ void iwl3945_request_scan(struct iwl_priv *priv) 
	/* select Rx antennas */

	scan->flags |= iwl3945_get_antenna_flags(priv);



	if (iwl_is_monitor_mode(priv))

		scan->filter_flags = RXON_FILTER_PROMISC_MSK;



	scan->channel_count =

		iwl3945_get_channels_for_scan(priv, band, is_active, n_probes,

			(void *)&scan->data[le16_to_cpu(scan->tx_cmd.len)]);