mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-15 15:15:47 +00:00
Code Issues Releases Wiki Activity

staging: vt6656: mac80211 conversion: vnt_update_ifs change basic rates

Browse source 
Use wBasicRate to find ofdm_rate.

wBasicRate is changed to u32 to match struct ieee80211_bss_conf -> basic_rates

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Malcolm Priestley 2014-06-25 21:14:28 +01:00 committed by Greg Kroah-Hartman
parent 30816f838a
commit ee61fde207
2 changed files with 3 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
drivers/staging/vt6656/card.c
View file

@ -402,10 +402,8 @@ void vnt_update_ifs(struct vnt_private *priv)
priv->uCwMin = C_CWMIN_B;
max_min = 5;
} else {/* PK_TYPE_11GA & PK_TYPE_11GB */
u8 rate = 0;
bool ofdm_rate = false;
unsigned int ii = 0;
PWLAN_IE_SUPP_RATES item_rates = NULL;
priv->uSIFS = C_SIFS_BG;
@ -416,29 +414,13 @@ void vnt_update_ifs(struct vnt_private *priv)
priv->uDIFS = C_SIFS_BG + 2 * priv->uSlot;
item_rates =
(PWLAN_IE_SUPP_RATES)priv->vnt_mgmt.abyCurrSuppRates;
for (ii = 0; ii < item_rates->len; ii++) {
rate = (u8)(item_rates->abyRates[ii] & 0x7f);
if (RATEwGetRateIdx(rate) > RATE_11M) {
for (ii = RATE_54M; ii >= RATE_6M; ii--) {
if (priv->wBasicRate & ((u32)(0x1 << ii))) {
ofdm_rate = true;
break;
}
}
if (ofdm_rate == false) {
item_rates = (PWLAN_IE_SUPP_RATES)priv->vnt_mgmt
.abyCurrExtSuppRates;
for (ii = 0; ii < item_rates->len; ii++) {
rate = (u8)(item_rates->abyRates[ii] & 0x7f);
if (RATEwGetRateIdx(rate) > RATE_11M) {
ofdm_rate = true;
break;
}
}
}
if (ofdm_rate == true) {
priv->uCwMin = C_CWMIN_A;
max_min = 4;

2
drivers/staging/vt6656/device.h
View file

@ -522,7 +522,7 @@ struct vnt_private {
/* Rate */
u8 byBBType; /* 0: 11A, 1:11B, 2:11G */
u8 byPacketType; /* 0:11a 1:11b 2:11gb 3:11ga */
u16 wBasicRate;
u32 wBasicRate;
u8 byTopOFDMBasicRate;
u8 byTopCCKBasicRate;