diff options
| author | Wey-Yi Guy | 2009-04-20 23:37:00 +0200 |
|---|---|---|
| committer | John W. Linville | 2009-04-22 22:57:19 +0200 |
| commit | 279b05d4362472ae9269f982f00e644265bdbf94 (patch) | |
| tree | ab919727ebb69a6d88e4285beb45254a0891eae0 /drivers/net/wireless/iwlwifi/iwl-rx.c | |
| parent | iwl3945: calculate debugfs isr statistics (diff) | |
| download | kernel-qcow2-linux-279b05d4362472ae9269f982f00e644265bdbf94.tar.gz kernel-qcow2-linux-279b05d4362472ae9269f982f00e644265bdbf94.tar.xz kernel-qcow2-linux-279b05d4362472ae9269f982f00e644265bdbf94.zip | |
iwlwifi: clean up unused NL80211_IFTYPE_MONITOR for Monitor mode
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>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-rx.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-rx.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-rx.c b/drivers/net/wireless/iwlwifi/iwl-rx.c index 8f65908f66f1..fae84262efb6 100644 --- a/drivers/net/wireless/iwlwifi/iwl-rx.c +++ b/drivers/net/wireless/iwlwifi/iwl-rx.c @@ -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) 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); if (network_packet) { priv->last_rx_rssi = rx_status.signal; |