Commit 4607816f authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

iwlwifi: remove unused essid variable 



Now the essid stuff is unused, so remove it.

Signed-off-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent a57a59f2

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

+0 −2
Original line number Diff line number Diff line
@@ -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;

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

+0 −12
Original line number Diff line number Diff line
@@ -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)
@@ -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);
@@ -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);

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

+0 −2
Original line number Diff line number Diff line
@@ -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;

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

+0 −12
Original line number Diff line number Diff line
@@ -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)
@@ -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);
@@ -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);

CRA Git | Maintained and supported by SUSTech CRA and CCSE