Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d8052319 authored by Abhijeet Kolekar's avatar Abhijeet Kolekar Committed by John W. Linville
Browse files

iwl3945: use iwl_mac_remove_interface from iwlwifi 



3945 can now use iwl_mac_remove_interface from iwlwifi

Signed-off-by: default avatarAbhijeet Kolekar <abhijeet.kolekar@intel.com>
Signed-off-by: default avatarReinette Chatre <reinette.chatre@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent cbb6ab94

drivers/net/wireless/iwlwifi/iwl-agn.c

+0 −24
Original line number Diff line number Diff line
@@ -2332,30 +2332,6 @@ static int iwl_mac_config_interface(struct ieee80211_hw *hw, 
	return 0;

}



static void iwl_mac_remove_interface(struct ieee80211_hw *hw,

				     struct ieee80211_if_init_conf *conf)

{

	struct iwl_priv *priv = hw->priv;



	IWL_DEBUG_MAC80211(priv, "enter\n");



	mutex_lock(&priv->mutex);



	if (iwl_is_ready_rf(priv)) {

		iwl_scan_cancel_timeout(priv, 100);

		priv->staging_rxon.filter_flags &= ~RXON_FILTER_ASSOC_MSK;

		iwlcore_commit_rxon(priv);

	}

	if (priv->vif == conf->vif) {

		priv->vif = NULL;

		memset(priv->bssid, 0, ETH_ALEN);

	}

	mutex_unlock(&priv->mutex);



	IWL_DEBUG_MAC80211(priv, "leave\n");



}



static void iwl_mac_update_tkip_key(struct ieee80211_hw *hw,

			struct ieee80211_key_conf *keyconf, const u8 *addr,

			u32 iv32, u16 *phase1key)

drivers/net/wireless/iwlwifi/iwl-core.c

+25 −0
Original line number Diff line number Diff line
@@ -2418,6 +2418,31 @@ int iwl_mac_add_interface(struct ieee80211_hw *hw, 
}

EXPORT_SYMBOL(iwl_mac_add_interface);



void iwl_mac_remove_interface(struct ieee80211_hw *hw,

				     struct ieee80211_if_init_conf *conf)

{

	struct iwl_priv *priv = hw->priv;



	IWL_DEBUG_MAC80211(priv, "enter\n");



	mutex_lock(&priv->mutex);



	if (iwl_is_ready_rf(priv)) {

		iwl_scan_cancel_timeout(priv, 100);

		priv->staging_rxon.filter_flags &= ~RXON_FILTER_ASSOC_MSK;

		iwlcore_commit_rxon(priv);

	}

	if (priv->vif == conf->vif) {

		priv->vif = NULL;

		memset(priv->bssid, 0, ETH_ALEN);

	}

	mutex_unlock(&priv->mutex);



	IWL_DEBUG_MAC80211(priv, "leave\n");



}

EXPORT_SYMBOL(iwl_mac_remove_interface);



#ifdef CONFIG_PM



int iwl_pci_suspend(struct pci_dev *pdev, pm_message_t state)

drivers/net/wireless/iwlwifi/iwl-core.h

+2 −0
Original line number Diff line number Diff line
@@ -276,6 +276,8 @@ int iwl_commit_rxon(struct iwl_priv *priv); 
int iwl_set_mode(struct iwl_priv *priv, int mode);

int iwl_mac_add_interface(struct ieee80211_hw *hw,

				 struct ieee80211_if_init_conf *conf);

void iwl_mac_remove_interface(struct ieee80211_hw *hw,

				 struct ieee80211_if_init_conf *conf);



/*****************************************************

 * RX handlers.

drivers/net/wireless/iwlwifi/iwl3945-base.c

+1 −24
Original line number Diff line number Diff line
@@ -3640,29 +3640,6 @@ static int iwl3945_mac_config_interface(struct ieee80211_hw *hw, 
	return 0;

}



static void iwl3945_mac_remove_interface(struct ieee80211_hw *hw,

				     struct ieee80211_if_init_conf *conf)

{

	struct iwl_priv *priv = hw->priv;



	IWL_DEBUG_MAC80211(priv, "enter\n");



	mutex_lock(&priv->mutex);



	if (iwl_is_ready_rf(priv)) {

		iwl_scan_cancel_timeout(priv, 100);

		priv->staging_rxon.filter_flags &= ~RXON_FILTER_ASSOC_MSK;

		iwlcore_commit_rxon(priv);

	}

	if (priv->vif == conf->vif) {

		priv->vif = NULL;

		memset(priv->bssid, 0, ETH_ALEN);

	}

	mutex_unlock(&priv->mutex);



	IWL_DEBUG_MAC80211(priv, "leave\n");

}



static int iwl3945_mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,

			       struct ieee80211_vif *vif,

			       struct ieee80211_sta *sta,
@@ -4338,7 +4315,7 @@ static struct ieee80211_ops iwl3945_hw_ops = { 
	.start = iwl3945_mac_start,

	.stop = iwl3945_mac_stop,

	.add_interface = iwl_mac_add_interface,

	.remove_interface = iwl3945_mac_remove_interface,

	.remove_interface = iwl_mac_remove_interface,

	.config = iwl3945_mac_config,

	.config_interface = iwl3945_mac_config_interface,

	.configure_filter = iwl_configure_filter,