aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/intel/iwlwifi/mvm/sta.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2017-02-24 06:02:22 -0500
committerLuca Coelho <luciano.coelho@intel.com>2017-04-25 15:36:26 -0400
commit7daa7624e3adeba0955141d95eef9d66c78e945f (patch)
tree56c0570ac9465d0cf8a6c6d3493927bc45a3764d /drivers/net/wireless/intel/iwlwifi/mvm/sta.c
parent5311a2476ef3e7ea4bc32d4f5f9ed118be624194 (diff)
iwlwifi: mvm: avoid variable shadowing
Remove an extra variable 'queue' that already exists. Also, since there are no code paths that use 'queue' without intializing it, remove the unnecessary zero initialization. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Diffstat (limited to 'drivers/net/wireless/intel/iwlwifi/mvm/sta.c')
-rw-r--r--drivers/net/wireless/intel/iwlwifi/mvm/sta.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/sta.c b/drivers/net/wireless/intel/iwlwifi/mvm/sta.c
index fc6d854b04b6..e502a6e6bf90 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/sta.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/sta.c
@@ -1895,7 +1895,7 @@ int iwl_mvm_send_add_bcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif)
1895 struct iwl_mvm_int_sta *bsta = &mvmvif->bcast_sta; 1895 struct iwl_mvm_int_sta *bsta = &mvmvif->bcast_sta;
1896 static const u8 _baddr[] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}; 1896 static const u8 _baddr[] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
1897 const u8 *baddr = _baddr; 1897 const u8 *baddr = _baddr;
1898 int queue = 0; 1898 int queue;
1899 int ret; 1899 int ret;
1900 unsigned int wdg_timeout = 1900 unsigned int wdg_timeout =
1901 iwl_mvm_get_wd_timeout(mvm, vif, false, false); 1901 iwl_mvm_get_wd_timeout(mvm, vif, false, false);
@@ -1940,10 +1940,11 @@ int iwl_mvm_send_add_bcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif)
1940 * to firmware so enable queue here - after the station was added 1940 * to firmware so enable queue here - after the station was added
1941 */ 1941 */
1942 if (iwl_mvm_has_new_tx_api(mvm)) { 1942 if (iwl_mvm_has_new_tx_api(mvm)) {
1943 int queue = iwl_mvm_tvqm_enable_txq(mvm, vif->hw_queue[0], 1943 queue = iwl_mvm_tvqm_enable_txq(mvm, vif->hw_queue[0],
1944 bsta->sta_id, 1944 bsta->sta_id,
1945 IWL_MAX_TID_COUNT, 1945 IWL_MAX_TID_COUNT,
1946 wdg_timeout); 1946 wdg_timeout);
1947
1947 if (vif->type == NL80211_IFTYPE_AP) 1948 if (vif->type == NL80211_IFTYPE_AP)
1948 mvm->probe_queue = queue; 1949 mvm->probe_queue = queue;
1949 else if (vif->type == NL80211_IFTYPE_P2P_DEVICE) 1950 else if (vif->type == NL80211_IFTYPE_P2P_DEVICE)