p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

mwl8k: refactor some conditionals for clarity 

CC [M]  drivers/net/wireless/mwl8k.o
drivers/net/wireless/mwl8k.c: In function ‘mwl8k_bss_info_changed’:
drivers/net/wireless/mwl8k.c:3290:2: warning: ‘ap_mcs_rates’ may be used uninitialized in this function [-Wmaybe-uninitialized]
  memcpy(cmd->mcs_set, mcs_rates, 16);
  ^
drivers/net/wireless/mwl8k.c:4987:5: note: ‘ap_mcs_rates’ was declared here
  u8 ap_mcs_rates[16];
     ^

The warning was bogus.  But the conditionals were rather complicated,
with multiple redundant checks.  This consolidates the checking and
makes it more readable IMHO.

Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
This commit is contained in:
John Linville 2015-08-10 12:05:39 -04:00 committed by Kalle Valo
parent 9ff4b6de26
commit bafc6e4cd8
1 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
drivers/net/wireless/mwl8k.c
View File

@ -5019,35 +5019,36 @@ mwl8k_bss_info_changed_sta(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
memcpy(ap_mcs_rates, ap->ht_cap.mcs.rx_mask, 16);
rcu_read_unlock();
}
if ((changed & BSS_CHANGED_ASSOC) && vif->bss_conf.assoc &&
!priv->ap_fw) {
rc = mwl8k_cmd_set_rate(hw, vif, ap_legacy_rates, ap_mcs_rates);
if (rc)
goto out;
if (changed & BSS_CHANGED_ASSOC) {
if (!priv->ap_fw) {
rc = mwl8k_cmd_set_rate(hw, vif,
ap_legacy_rates,
ap_mcs_rates);
if (rc)
goto out;
rc = mwl8k_cmd_use_fixed_rate_sta(hw);
if (rc)
goto out;
} else {
if ((changed & BSS_CHANGED_ASSOC) && vif->bss_conf.assoc &&
priv->ap_fw) {
int idx;
int rate;
rc = mwl8k_cmd_use_fixed_rate_sta(hw);
if (rc)
goto out;
} else {
int idx;
int rate;
/* Use AP firmware specific rate command.
*/
idx = ffs(vif->bss_conf.basic_rates);
if (idx)
idx--;
/* Use AP firmware specific rate command.
*/
idx = ffs(vif->bss_conf.basic_rates);
if (idx)
idx--;
if (hw->conf.chandef.chan->band == IEEE80211_BAND_2GHZ)
rate = mwl8k_rates_24[idx].hw_value;
else
rate = mwl8k_rates_50[idx].hw_value;
if (hw->conf.chandef.chan->band ==
IEEE80211_BAND_2GHZ)
rate = mwl8k_rates_24[idx].hw_value;
else
rate = mwl8k_rates_50[idx].hw_value;
mwl8k_cmd_use_fixed_rate_ap(hw, rate, rate);
mwl8k_cmd_use_fixed_rate_ap(hw, rate, rate);
}
}
}