UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Johannes Berg 2008-10-28 18:25:43 +01:00 committed by John W. Linville
parent a57a59f247
commit 4607816f60
4 changed files with 0 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/wireless/iwlwifi/iwl-3945.h
View File

@ -828,8 +828,6 @@ struct iwl3945_priv {
unsigned long last_statistics_time; unsigned long last_statistics_time;
/* context information */ /* context information */
u8 essid[IW_ESSID_MAX_SIZE];
u8 essid_len;
u16 rates_mask; u16 rates_mask;
u32 power_mode; u32 power_mode;

12
drivers/net/wireless/iwlwifi/iwl-agn.c
View File

@ -2937,7 +2937,6 @@ static int iwl4965_mac_config_interface(struct ieee80211_hw *hw,
struct ieee80211_if_conf *conf) struct ieee80211_if_conf *conf)
{ {
struct iwl_priv *priv = hw->priv; struct iwl_priv *priv = hw->priv;
unsigned long flags;
int rc; int rc;
if (conf == NULL) if (conf == NULL)
@ -3031,15 +3030,6 @@ static int iwl4965_mac_config_interface(struct ieee80211_hw *hw,
} }
done: done:
spin_lock_irqsave(&priv->lock, flags);
if (!conf->ssid_len)
memset(priv->essid, 0, IW_ESSID_MAX_SIZE);
else
memcpy(priv->essid, conf->ssid, conf->ssid_len);
priv->essid_len = conf->ssid_len;
spin_unlock_irqrestore(&priv->lock, flags);
IWL_DEBUG_MAC80211("leave\n"); IWL_DEBUG_MAC80211("leave\n");
mutex_unlock(&priv->mutex); mutex_unlock(&priv->mutex);
@ -3082,8 +3072,6 @@ static void iwl4965_mac_remove_interface(struct ieee80211_hw *hw,
if (priv->vif == conf->vif) { if (priv->vif == conf->vif) {
priv->vif = NULL; priv->vif = NULL;
memset(priv->bssid, 0, ETH_ALEN); memset(priv->bssid, 0, ETH_ALEN);
memset(priv->essid, 0, IW_ESSID_MAX_SIZE);
priv->essid_len = 0;
} }
mutex_unlock(&priv->mutex); mutex_unlock(&priv->mutex);

2
drivers/net/wireless/iwlwifi/iwl-dev.h
View File

@ -926,8 +926,6 @@ struct iwl_priv {
unsigned long last_statistics_time; unsigned long last_statistics_time;
/* context information */ /* context information */
u8 essid[IW_ESSID_MAX_SIZE];
u8 essid_len;
u16 rates_mask; u16 rates_mask;
u32 power_mode; u32 power_mode;

12
drivers/net/wireless/iwlwifi/iwl3945-base.c
View File

@ -6720,7 +6720,6 @@ static int iwl3945_mac_config_interface(struct ieee80211_hw *hw,
struct ieee80211_if_conf *conf) struct ieee80211_if_conf *conf)
{ {
struct iwl3945_priv *priv = hw->priv; struct iwl3945_priv *priv = hw->priv;
unsigned long flags;
int rc; int rc;
if (conf == NULL) if (conf == NULL)
@ -6817,15 +6816,6 @@ static int iwl3945_mac_config_interface(struct ieee80211_hw *hw,
} }
done: done:
spin_lock_irqsave(&priv->lock, flags);
if (!conf->ssid_len)
memset(priv->essid, 0, IW_ESSID_MAX_SIZE);
else
memcpy(priv->essid, conf->ssid, conf->ssid_len);
priv->essid_len = conf->ssid_len;
spin_unlock_irqrestore(&priv->lock, flags);
IWL_DEBUG_MAC80211("leave\n"); IWL_DEBUG_MAC80211("leave\n");
mutex_unlock(&priv->mutex); mutex_unlock(&priv->mutex);
@ -6868,8 +6858,6 @@ static void iwl3945_mac_remove_interface(struct ieee80211_hw *hw,
if (priv->vif == conf->vif) { if (priv->vif == conf->vif) {
priv->vif = NULL; priv->vif = NULL;
memset(priv->bssid, 0, ETH_ALEN); memset(priv->bssid, 0, ETH_ALEN);
memset(priv->essid, 0, IW_ESSID_MAX_SIZE);
priv->essid_len = 0;
} }
mutex_unlock(&priv->mutex); mutex_unlock(&priv->mutex);