FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2025-02-05 02:38:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

iwlwifi: clean up unused NL80211_IFTYPE_MONITOR for Monitor mode

Browse Source 
This patch clean up the code for NL80211_IFTYPE_MONITOR mode,
priv->iw_mode is set in add_interface, but add_interface is never called
for monitor mode.
The only way mac80211 informs us about monitor mode is through
configuring filter; since iw_mode will never set to
NL80211_IFTYPE_MONITOR, modify and remove all the code refer to
NL80211_IFTYPE_MONITOR and replace with iwl_is_monitor_mode() function
call.

Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Wey-Yi Guy 2009-04-20 14:37:00 -07:00 committed by John W. Linville
parent 86ddbf62c2
commit 279b05d436
8 changed files with 7 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/wireless/iwlwifi/iwl-agn.c
View File

@ -2001,8 +2001,6 @@ static int iwl_mac_start(struct ieee80211_hw *hw)
out: out:
priv->is_open = 1; priv->is_open = 1;
/* default to MONITOR mode */
priv->iw_mode = NL80211_IFTYPE_MONITOR;
IWL_DEBUG_MAC80211(priv, "leave\n"); IWL_DEBUG_MAC80211(priv, "leave\n");
return 0; return 0;
} }

8
drivers/net/wireless/iwlwifi/iwl-core.c
View File

@ -904,10 +904,11 @@ static u8 iwl_count_chain_bitmap(u32 chain_bitmap)
* never called for monitor mode. The only way mac80211 informs us about * never called for monitor mode. The only way mac80211 informs us about
* monitor mode is through configuring filters (call to configure_filter). * monitor mode is through configuring filters (call to configure_filter).
*/ */
static bool iwl_is_monitor_mode(struct iwl_priv *priv) bool iwl_is_monitor_mode(struct iwl_priv *priv)
{ {
return !!(priv->staging_rxon.filter_flags & RXON_FILTER_PROMISC_MSK); 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 * iwl_set_rxon_chain - Set up Rx chain usage in "staging" RXON image
@ -1071,11 +1072,6 @@ void iwl_connection_init_rx_config(struct iwl_priv *priv, int mode)
RXON_FILTER_ACCEPT_GRP_MSK; RXON_FILTER_ACCEPT_GRP_MSK;
break; break;
case NL80211_IFTYPE_MONITOR:
priv->staging_rxon.dev_type = RXON_DEV_TYPE_SNIFFER;
priv->staging_rxon.filter_flags = RXON_FILTER_PROMISC_MSK |
RXON_FILTER_CTL2HOST_MSK | RXON_FILTER_ACCEPT_GRP_MSK;
break;
default: default:
IWL_ERR(priv, "Unsupported interface type %d\n", mode); IWL_ERR(priv, "Unsupported interface type %d\n", mode);
break; break;

1
drivers/net/wireless/iwlwifi/iwl-core.h
View File

@ -267,6 +267,7 @@ int iwl_setup_mac(struct iwl_priv *priv);
int iwl_set_hw_params(struct iwl_priv *priv); int iwl_set_hw_params(struct iwl_priv *priv);
int iwl_init_drv(struct iwl_priv *priv); int iwl_init_drv(struct iwl_priv *priv);
void iwl_uninit_drv(struct iwl_priv *priv); void iwl_uninit_drv(struct iwl_priv *priv);
bool iwl_is_monitor_mode(struct iwl_priv *priv);
void iwl_post_associate(struct iwl_priv *priv); void iwl_post_associate(struct iwl_priv *priv);
void iwl_bss_info_changed(struct ieee80211_hw *hw, void iwl_bss_info_changed(struct ieee80211_hw *hw,
struct ieee80211_vif *vif, struct ieee80211_vif *vif,

7
drivers/net/wireless/iwlwifi/iwl-rx.c
View File

@ -1102,13 +1102,6 @@ void iwl_rx_reply_rx(struct iwl_priv *priv,
if (rx_start->phy_flags & RX_RES_PHY_FLAGS_SHORT_PREAMBLE_MSK) if (rx_start->phy_flags & RX_RES_PHY_FLAGS_SHORT_PREAMBLE_MSK)
rx_status.flag |= RX_FLAG_SHORTPRE; rx_status.flag |= RX_FLAG_SHORTPRE;
/* Take shortcut when only in monitor mode */
if (priv->iw_mode == NL80211_IFTYPE_MONITOR) {
iwl_pass_packet_to_mac80211(priv, include_phy,
rxb, &rx_status);
return;
}
network_packet = iwl_is_network_packet(priv, header); network_packet = iwl_is_network_packet(priv, header);
if (network_packet) { if (network_packet) {
priv->last_rx_rssi = rx_status.signal; priv->last_rx_rssi = rx_status.signal;

2
drivers/net/wireless/iwlwifi/iwl-scan.c
View File

@ -747,7 +747,7 @@ static void iwl_bg_request_scan(struct work_struct *data)
scan->tx_cmd.len = cpu_to_le16(cmd_len); scan->tx_cmd.len = cpu_to_le16(cmd_len);
if (priv->iw_mode == NL80211_IFTYPE_MONITOR) if (iwl_is_monitor_mode(priv))
scan->filter_flags = RXON_FILTER_PROMISC_MSK; scan->filter_flags = RXON_FILTER_PROMISC_MSK;
scan->filter_flags |= (RXON_FILTER_ACCEPT_GRP_MSK | scan->filter_flags |= (RXON_FILTER_ACCEPT_GRP_MSK |

5
drivers/net/wireless/iwlwifi/iwl-sta.c
View File

@ -1078,11 +1078,6 @@ int iwl_get_sta_id(struct iwl_priv *priv, struct ieee80211_hdr *hdr)
iwl_print_hex_dump(priv, IWL_DL_DROP, (u8 *) hdr, sizeof(*hdr)); iwl_print_hex_dump(priv, IWL_DL_DROP, (u8 *) hdr, sizeof(*hdr));
return priv->hw_params.bcast_sta_id; return priv->hw_params.bcast_sta_id;
/* If we are in monitor mode, use BCAST. This is required for
* packet injection. */
case NL80211_IFTYPE_MONITOR:
return priv->hw_params.bcast_sta_id;
default: default:
IWL_WARN(priv, "Unknown mode of operation: %d\n", IWL_WARN(priv, "Unknown mode of operation: %d\n",
priv->iw_mode); priv->iw_mode);

2
drivers/net/wireless/iwlwifi/iwl-tx.c
View File

@ -728,7 +728,7 @@ int iwl_tx_skb(struct iwl_priv *priv, struct sk_buff *skb)
/* drop all data frame if we are not associated */ /* drop all data frame if we are not associated */
if (ieee80211_is_data(fc) && if (ieee80211_is_data(fc) &&
(priv->iw_mode != NL80211_IFTYPE_MONITOR || (!iwl_is_monitor_mode(priv) ||
!(info->flags & IEEE80211_TX_CTL_INJECTED)) && /* packet injection */ !(info->flags & IEEE80211_TX_CTL_INJECTED)) && /* packet injection */
(!iwl_is_associated(priv) || (!iwl_is_associated(priv) ||
((priv->iw_mode == NL80211_IFTYPE_STATION) && !priv->assoc_id) || ((priv->iw_mode == NL80211_IFTYPE_STATION) && !priv->assoc_id) ||

4
drivers/net/wireless/iwlwifi/iwl3945-base.c
View File

@ -729,7 +729,7 @@ static int iwl3945_tx_skb(struct iwl_priv *priv, struct sk_buff *skb)
/* drop all data frame if we are not associated */ /* drop all data frame if we are not associated */
if (ieee80211_is_data(fc) && if (ieee80211_is_data(fc) &&
(priv->iw_mode != NL80211_IFTYPE_MONITOR) && /* packet injection */ (!iwl_is_monitor_mode(priv)) && /* packet injection */
(!iwl_is_associated(priv) || (!iwl_is_associated(priv) ||
((priv->iw_mode == NL80211_IFTYPE_STATION) && !priv->assoc_id))) { ((priv->iw_mode == NL80211_IFTYPE_STATION) && !priv->assoc_id))) {
IWL_DEBUG_DROP(priv, "Dropping - !iwl_is_associated\n"); IWL_DEBUG_DROP(priv, "Dropping - !iwl_is_associated\n");
@ -3113,7 +3113,7 @@ static void iwl3945_bg_request_scan(struct work_struct *data)
/* select Rx antennas */ /* select Rx antennas */
scan->flags |= iwl3945_get_antenna_flags(priv); scan->flags |= iwl3945_get_antenna_flags(priv);
if (priv->iw_mode == NL80211_IFTYPE_MONITOR) if (iwl_is_monitor_mode(priv))
scan->filter_flags = RXON_FILTER_PROMISC_MSK; scan->filter_flags = RXON_FILTER_PROMISC_MSK;
scan->channel_count = scan->channel_count =