system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-10-27 05:39:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

ath9k: Cleanup ath_rc_setvalid_rates

Browse source 
Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Sujith Manoharan 2012-08-10 16:46:11 +05:30 committed by John W. Linville
parent ea2771f642
commit c05ea15177
1 changed files with 20 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
drivers/net/wireless/ath/ath9k/rc.c
View file

@ -516,39 +516,32 @@ static u8 ath_rc_setvalid_rates(struct ath_rate_priv *ath_rc_priv)
{
const struct ath_rate_table *rate_table = ath_rc_priv->rate_table;
struct ath_rateset *rateset = &ath_rc_priv->neg_rates;
u32 capflag = ath_rc_priv->ht_cap;
u8 i, j, hi = 0;
u32 phy, capflag = ath_rc_priv->ht_cap;
u16 rate_flags;
u8 i, j, hi = 0, rate, dot11rate, valid_rate_count;
for (i = 0; i < rateset->rs_nrates; i++) {
for (j = 0; j < rate_table->rate_cnt; j++) {
u32 phy = rate_table->info[j].phy;
u16 rate_flags = rate_table->info[j].rate_flags;
u8 rate = rateset->rs_rates[i];
u8 dot11rate = rate_table->info[j].dot11rate;
phy = rate_table->info[j].phy;
rate_flags = rate_table->info[j].rate_flags;
rate = rateset->rs_rates[i];
dot11rate = rate_table->info[j].dot11rate;
/* We allow a rate only if its valid and the
* capflag matches one of the validity
* (VALID/VALID_20/VALID_40) flags */
if (rate != dot11rate
|| ((rate_flags & WLAN_RC_CAP_MODE(capflag)) !=
WLAN_RC_CAP_MODE(capflag))
|| !(rate_flags & WLAN_RC_CAP_STREAM(capflag))
|| WLAN_RC_PHY_HT(phy))
continue;
if ((rate == dot11rate) &&
(rate_flags & WLAN_RC_CAP_MODE(capflag)) ==
WLAN_RC_CAP_MODE(capflag) &&
(rate_flags & WLAN_RC_CAP_STREAM(capflag)) &&
!WLAN_RC_PHY_HT(phy)) {
u8 valid_rate_count = 0;
if (!ath_rc_valid_phyrate(phy, capflag, 0))
continue;
if (!ath_rc_valid_phyrate(phy, capflag, 0))
continue;
valid_rate_count =
ath_rc_priv->valid_phy_ratecnt[phy];
ath_rc_priv->valid_phy_rateidx[phy]
[valid_rate_count] = j;
ath_rc_priv->valid_phy_ratecnt[phy] += 1;
ath_rc_set_valid_rate_idx(ath_rc_priv, j, 1);
hi = max(hi, j);
}
valid_rate_count = ath_rc_priv->valid_phy_ratecnt[phy];
ath_rc_priv->valid_phy_rateidx[phy][valid_rate_count] = j;
ath_rc_priv->valid_phy_ratecnt[phy] += 1;
ath_rc_set_valid_rate_idx(ath_rc_priv, j, 1);
hi = max(hi, j);
}
}