Skip to content

Commit

Permalink
iwlwifi: remove unused essid variable
Browse files Browse the repository at this point in the history 
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>
  • Loading branch information
Johannes Berg authored and John W. Linville committed Nov 10, 2008
1 parent a57a59f commit 4607816
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 28 deletions.
2 changes: 0 additions & 2 deletions drivers/net/wireless/iwlwifi/iwl-3945.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -828,8 +828,6 @@ struct iwl3945_priv {
unsigned long last_statistics_time;

/* context information */
u8 essid[IW_ESSID_MAX_SIZE];
u8 essid_len;
u16 rates_mask;

u32 power_mode;
Expand Down
12 changes: 0 additions & 12 deletions drivers/net/wireless/iwlwifi/iwl-agn.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2937,7 +2937,6 @@ static int iwl4965_mac_config_interface(struct ieee80211_hw *hw,
struct ieee80211_if_conf *conf)
{
struct iwl_priv *priv = hw->priv;
unsigned long flags;
int rc;

if (conf == NULL)
Expand Down Expand Up @@ -3031,15 +3030,6 @@ static int iwl4965_mac_config_interface(struct ieee80211_hw *hw,
}

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");
mutex_unlock(&priv->mutex);

Expand Down Expand Up @@ -3082,8 +3072,6 @@ static void iwl4965_mac_remove_interface(struct ieee80211_hw *hw,
if (priv->vif == conf->vif) {
priv->vif = NULL;
memset(priv->bssid, 0, ETH_ALEN);
memset(priv->essid, 0, IW_ESSID_MAX_SIZE);
priv->essid_len = 0;
}
mutex_unlock(&priv->mutex);

Expand Down
2 changes: 0 additions & 2 deletions drivers/net/wireless/iwlwifi/iwl-dev.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -926,8 +926,6 @@ struct iwl_priv {
unsigned long last_statistics_time;

/* context information */
u8 essid[IW_ESSID_MAX_SIZE];
u8 essid_len;
u16 rates_mask;

u32 power_mode;
Expand Down
12 changes: 0 additions & 12 deletions drivers/net/wireless/iwlwifi/iwl3945-base.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6720,7 +6720,6 @@ static int iwl3945_mac_config_interface(struct ieee80211_hw *hw,
struct ieee80211_if_conf *conf)
{
struct iwl3945_priv *priv = hw->priv;
unsigned long flags;
int rc;

if (conf == NULL)
Expand Down Expand Up @@ -6817,15 +6816,6 @@ static int iwl3945_mac_config_interface(struct ieee80211_hw *hw,
}

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");
mutex_unlock(&priv->mutex);

Expand Down Expand Up @@ -6868,8 +6858,6 @@ static void iwl3945_mac_remove_interface(struct ieee80211_hw *hw,
if (priv->vif == conf->vif) {
priv->vif = NULL;
memset(priv->bssid, 0, ETH_ALEN);
memset(priv->essid, 0, IW_ESSID_MAX_SIZE);
priv->essid_len = 0;
}
mutex_unlock(&priv->mutex);

Expand Down

0 comments on commit 4607816

Please sign in to comment.