tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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>

authored by

Johannes Berg and committed by
John W. Linville 4607816f a57a59f2

-28
-2
drivers/net/wireless/iwlwifi/iwl-3945.h
··· 828 828 unsigned long last_statistics_time; 829 829 830 830 /* context information */ 831 - u8 essid[IW_ESSID_MAX_SIZE]; 832 - u8 essid_len; 833 831 u16 rates_mask; 834 832 835 833 u32 power_mode;
-12
drivers/net/wireless/iwlwifi/iwl-agn.c
··· 2937 2937 struct ieee80211_if_conf *conf) 2938 2938 { 2939 2939 struct iwl_priv *priv = hw->priv; 2940 - unsigned long flags; 2941 2940 int rc; 2942 2941 2943 2942 if (conf == NULL) ··· 3030 3031 } 3031 3032 3032 3033 done: 3033 - spin_lock_irqsave(&priv->lock, flags); 3034 - if (!conf->ssid_len) 3035 - memset(priv->essid, 0, IW_ESSID_MAX_SIZE); 3036 - else 3037 - memcpy(priv->essid, conf->ssid, conf->ssid_len); 3038 - 3039 - priv->essid_len = conf->ssid_len; 3040 - spin_unlock_irqrestore(&priv->lock, flags); 3041 - 3042 3034 IWL_DEBUG_MAC80211("leave\n"); 3043 3035 mutex_unlock(&priv->mutex); 3044 3036 ··· 3072 3082 if (priv->vif == conf->vif) { 3073 3083 priv->vif = NULL; 3074 3084 memset(priv->bssid, 0, ETH_ALEN); 3075 - memset(priv->essid, 0, IW_ESSID_MAX_SIZE); 3076 - priv->essid_len = 0; 3077 3085 } 3078 3086 mutex_unlock(&priv->mutex); 3079 3087
-2
drivers/net/wireless/iwlwifi/iwl-dev.h
··· 926 926 unsigned long last_statistics_time; 927 927 928 928 /* context information */ 929 - u8 essid[IW_ESSID_MAX_SIZE]; 930 - u8 essid_len; 931 929 u16 rates_mask; 932 930 933 931 u32 power_mode;
-12
drivers/net/wireless/iwlwifi/iwl3945-base.c
··· 6720 6720 struct ieee80211_if_conf *conf) 6721 6721 { 6722 6722 struct iwl3945_priv *priv = hw->priv; 6723 - unsigned long flags; 6724 6723 int rc; 6725 6724 6726 6725 if (conf == NULL) ··· 6816 6817 } 6817 6818 6818 6819 done: 6819 - spin_lock_irqsave(&priv->lock, flags); 6820 - if (!conf->ssid_len) 6821 - memset(priv->essid, 0, IW_ESSID_MAX_SIZE); 6822 - else 6823 - memcpy(priv->essid, conf->ssid, conf->ssid_len); 6824 - 6825 - priv->essid_len = conf->ssid_len; 6826 - spin_unlock_irqrestore(&priv->lock, flags); 6827 - 6828 6820 IWL_DEBUG_MAC80211("leave\n"); 6829 6821 mutex_unlock(&priv->mutex); 6830 6822 ··· 6858 6868 if (priv->vif == conf->vif) { 6859 6869 priv->vif = NULL; 6860 6870 memset(priv->bssid, 0, ETH_ALEN); 6861 - memset(priv->essid, 0, IW_ESSID_MAX_SIZE); 6862 - priv->essid_len = 0; 6863 6871 } 6864 6872 mutex_unlock(&priv->mutex); 6865 6873