aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-agn.c
diff options
context:
space:
mode:
authorAbhijeet Kolekar <abhijeet.kolekar@intel.com>2009-04-08 14:26:47 -0400
committerJohn W. Linville <linville@tuxdriver.com>2009-04-22 16:54:43 -0400
commitd8052319f2a7d1ee86248df00193110ad1946a33 (patch)
treee85620ca14c9be81546a7ec282031474d7a7b806 /drivers/net/wireless/iwlwifi/iwl-agn.c
parentcbb6ab94b66cfb7136e640191a9628c5a71220a3 (diff)
iwl3945: use iwl_mac_remove_interface from iwlwifi
3945 can now use iwl_mac_remove_interface from iwlwifi Signed-off-by: Abhijeet Kolekar <abhijeet.kolekar@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-agn.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-agn.c24
1 files changed, 0 insertions, 24 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index 7e7b584ec257..5cc30a223cf0 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -2332,30 +2332,6 @@ static int iwl_mac_config_interface(struct ieee80211_hw *hw,
2332 return 0; 2332 return 0;
2333} 2333}
2334 2334
2335static void iwl_mac_remove_interface(struct ieee80211_hw *hw,
2336 struct ieee80211_if_init_conf *conf)
2337{
2338 struct iwl_priv *priv = hw->priv;
2339
2340 IWL_DEBUG_MAC80211(priv, "enter\n");
2341
2342 mutex_lock(&priv->mutex);
2343
2344 if (iwl_is_ready_rf(priv)) {
2345 iwl_scan_cancel_timeout(priv, 100);
2346 priv->staging_rxon.filter_flags &= ~RXON_FILTER_ASSOC_MSK;
2347 iwlcore_commit_rxon(priv);
2348 }
2349 if (priv->vif == conf->vif) {
2350 priv->vif = NULL;
2351 memset(priv->bssid, 0, ETH_ALEN);
2352 }
2353 mutex_unlock(&priv->mutex);
2354
2355 IWL_DEBUG_MAC80211(priv, "leave\n");
2356
2357}
2358
2359static void iwl_mac_update_tkip_key(struct ieee80211_hw *hw, 2335static void iwl_mac_update_tkip_key(struct ieee80211_hw *hw,
2360 struct ieee80211_key_conf *keyconf, const u8 *addr, 2336 struct ieee80211_key_conf *keyconf, const u8 *addr,
2361 u32 iv32, u16 *phase1key) 2337 u32 iv32, u16 *phase1key)