diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2010-04-13 04:04:34 -0400 |
|---|---|---|
| committer | Reinette Chatre <reinette.chatre@intel.com> | 2010-04-16 16:54:16 -0400 |
| commit | ee102603c04d84d3079e3d593d88d5254085efa0 (patch) | |
| tree | 2ab76179c727205cd7591258429a94fb5a091f2d | |
| parent | fa58b6a3b34944bb9fc0129ba2534bd91d082d61 (diff) | |
iwlwifi: remove monitor check
Off-channel reception is acceptable in monitor
mode, and checking for monitor mode this way is
not really correct anyway since it could be the
case while operating.
Now iwl_is_monitor_mode() is no longer used so
remove it completely.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-core.c | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c index d282bef5d7ea..7a82b1abd8f7 100644 --- a/drivers/net/wireless/iwlwifi/iwl-core.c +++ b/drivers/net/wireless/iwlwifi/iwl-core.c | |||
| @@ -828,18 +828,6 @@ static u8 iwl_count_chain_bitmap(u32 chain_bitmap) | |||
| 828 | } | 828 | } |
| 829 | 829 | ||
| 830 | /** | 830 | /** |
| 831 | * iwl_is_monitor_mode - Determine if interface in monitor mode | ||
| 832 | * | ||
| 833 | * priv->iw_mode is set in add_interface, but add_interface is | ||
| 834 | * never called for monitor mode. The only way mac80211 informs us about | ||
| 835 | * monitor mode is through configuring filters (call to configure_filter). | ||
| 836 | */ | ||
| 837 | static bool iwl_is_monitor_mode(struct iwl_priv *priv) | ||
| 838 | { | ||
| 839 | return !!(priv->staging_rxon.filter_flags & RXON_FILTER_PROMISC_MSK); | ||
| 840 | } | ||
| 841 | |||
| 842 | /** | ||
| 843 | * iwl_set_rxon_chain - Set up Rx chain usage in "staging" RXON image | 831 | * iwl_set_rxon_chain - Set up Rx chain usage in "staging" RXON image |
| 844 | * | 832 | * |
| 845 | * Selects how many and which Rx receivers/antennas/chains to use. | 833 | * Selects how many and which Rx receivers/antennas/chains to use. |
| @@ -882,19 +870,6 @@ void iwl_set_rxon_chain(struct iwl_priv *priv) | |||
| 882 | rx_chain |= active_rx_cnt << RXON_RX_CHAIN_MIMO_CNT_POS; | 870 | rx_chain |= active_rx_cnt << RXON_RX_CHAIN_MIMO_CNT_POS; |
| 883 | rx_chain |= idle_rx_cnt << RXON_RX_CHAIN_CNT_POS; | 871 | rx_chain |= idle_rx_cnt << RXON_RX_CHAIN_CNT_POS; |
| 884 | 872 | ||
| 885 | /* copied from 'iwl_bg_request_scan()' */ | ||
| 886 | /* Force use of chains B and C (0x6) for Rx | ||
| 887 | * Avoid A (0x1) for the device has off-channel reception on A-band. | ||
| 888 | * MIMO is not used here, but value is required */ | ||
| 889 | if (iwl_is_monitor_mode(priv) && | ||
| 890 | !(priv->staging_rxon.flags & RXON_FLG_BAND_24G_MSK) && | ||
| 891 | priv->cfg->off_channel_workaround) { | ||
| 892 | rx_chain = ANT_ABC << RXON_RX_CHAIN_VALID_POS; | ||
| 893 | rx_chain |= ANT_BC << RXON_RX_CHAIN_FORCE_SEL_POS; | ||
| 894 | rx_chain |= ANT_ABC << RXON_RX_CHAIN_FORCE_MIMO_SEL_POS; | ||
| 895 | rx_chain |= 0x1 << RXON_RX_CHAIN_DRIVER_FORCE_POS; | ||
| 896 | } | ||
| 897 | |||
| 898 | priv->staging_rxon.rx_chain = cpu_to_le16(rx_chain); | 873 | priv->staging_rxon.rx_chain = cpu_to_le16(rx_chain); |
| 899 | 874 | ||
| 900 | if (!is_single && (active_rx_cnt >= IWL_NUM_RX_CHAINS_SINGLE) && is_cam) | 875 | if (!is_single && (active_rx_cnt >= IWL_NUM_RX_CHAINS_SINGLE) && is_cam) |