aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl3945-base.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2008-10-28 13:25:43 -0400
committerJohn W. Linville <linville@tuxdriver.com>2008-11-10 15:11:55 -0500
commit4607816f608b42a5379aca97ceed08378804c99f (patch)
treed7a0da1e1c11035518539de3fc11da8967bd65a8 /drivers/net/wireless/iwlwifi/iwl3945-base.c
parenta57a59f247b651e8ed6d3eeb7e2f9d83b83134c9 (diff)
iwlwifi: remove unused essid variable
Now the essid stuff is unused, so remove it. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl3945-base.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl3945-base.c12
1 files changed, 0 insertions, 12 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c
index bf372949747f..0c2d778a9ff7 100644
--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
@@ -6720,7 +6720,6 @@ static int iwl3945_mac_config_interface(struct ieee80211_hw *hw,
6720 struct ieee80211_if_conf *conf) 6720 struct ieee80211_if_conf *conf)
6721{ 6721{
6722 struct iwl3945_priv *priv = hw->priv; 6722 struct iwl3945_priv *priv = hw->priv;
6723 unsigned long flags;
6724 int rc; 6723 int rc;
6725 6724
6726 if (conf == NULL) 6725 if (conf == NULL)
@@ -6817,15 +6816,6 @@ static int iwl3945_mac_config_interface(struct ieee80211_hw *hw,
6817 } 6816 }
6818 6817
6819 done: 6818 done:
6820 spin_lock_irqsave(&priv->lock, flags);
6821 if (!conf->ssid_len)
6822 memset(priv->essid, 0, IW_ESSID_MAX_SIZE);
6823 else
6824 memcpy(priv->essid, conf->ssid, conf->ssid_len);
6825
6826 priv->essid_len = conf->ssid_len;
6827 spin_unlock_irqrestore(&priv->lock, flags);
6828
6829 IWL_DEBUG_MAC80211("leave\n"); 6819 IWL_DEBUG_MAC80211("leave\n");
6830 mutex_unlock(&priv->mutex); 6820 mutex_unlock(&priv->mutex);
6831 6821
@@ -6868,8 +6858,6 @@ static void iwl3945_mac_remove_interface(struct ieee80211_hw *hw,
6868 if (priv->vif == conf->vif) { 6858 if (priv->vif == conf->vif) {
6869 priv->vif = NULL; 6859 priv->vif = NULL;
6870 memset(priv->bssid, 0, ETH_ALEN); 6860 memset(priv->bssid, 0, ETH_ALEN);
6871 memset(priv->essid, 0, IW_ESSID_MAX_SIZE);
6872 priv->essid_len = 0;
6873 } 6861 }
6874 mutex_unlock(&priv->mutex); 6862 mutex_unlock(&priv->mutex);
6875 6863