diff options
author | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2009-04-20 17:37:00 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-04-22 16:57:19 -0400 |
commit | 279b05d4362472ae9269f982f00e644265bdbf94 (patch) | |
tree | ab919727ebb69a6d88e4285beb45254a0891eae0 /drivers/net/wireless/iwlwifi/iwl-sta.c | |
parent | 86ddbf62c2daefebba13e3c79f88cbdfde766176 (diff) |
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-sta.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-sta.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-sta.c b/drivers/net/wireless/iwlwifi/iwl-sta.c index b8f18c697888..17a4dd2be1f2 100644 --- a/drivers/net/wireless/iwlwifi/iwl-sta.c +++ b/drivers/net/wireless/iwlwifi/iwl-sta.c | |||
@@ -1078,11 +1078,6 @@ int iwl_get_sta_id(struct iwl_priv *priv, struct ieee80211_hdr *hdr) | |||
1078 | iwl_print_hex_dump(priv, IWL_DL_DROP, (u8 *) hdr, sizeof(*hdr)); | 1078 | iwl_print_hex_dump(priv, IWL_DL_DROP, (u8 *) hdr, sizeof(*hdr)); |
1079 | return priv->hw_params.bcast_sta_id; | 1079 | return priv->hw_params.bcast_sta_id; |
1080 | 1080 | ||
1081 | /* If we are in monitor mode, use BCAST. This is required for | ||
1082 | * packet injection. */ | ||
1083 | case NL80211_IFTYPE_MONITOR: | ||
1084 | return priv->hw_params.bcast_sta_id; | ||
1085 | |||
1086 | default: | 1081 | default: |
1087 | IWL_WARN(priv, "Unknown mode of operation: %d\n", | 1082 | IWL_WARN(priv, "Unknown mode of operation: %d\n", |
1088 | priv->iw_mode); | 1083 | priv->iw_mode); |