diff options
author | Malcolm Priestley | 2014-06-25 22:14:28 +0200 |
---|---|---|
committer | Greg Kroah-Hartman | 2014-06-27 02:21:19 +0200 |
commit | ee61fde2074fbcc7575e52206aba67853e0e56cc (patch) | |
tree | 39d0a7e3b4600fd29b2cd26695b8133befd3de3f /drivers/staging/vt6656/card.c | |
parent | staging: vt6656: mac80211 conversion: add vnt_init to bScheduleCommand (diff) | |
download | kernel-qcow2-linux-ee61fde2074fbcc7575e52206aba67853e0e56cc.tar.gz kernel-qcow2-linux-ee61fde2074fbcc7575e52206aba67853e0e56cc.tar.xz kernel-qcow2-linux-ee61fde2074fbcc7575e52206aba67853e0e56cc.zip |
staging: vt6656: mac80211 conversion: vnt_update_ifs change basic rates
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>
Diffstat (limited to 'drivers/staging/vt6656/card.c')
-rw-r--r-- | drivers/staging/vt6656/card.c | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/drivers/staging/vt6656/card.c b/drivers/staging/vt6656/card.c index 8be3a89d5a68..1b3e0af156ec 100644 --- a/drivers/staging/vt6656/card.c +++ b/drivers/staging/vt6656/card.c @@ -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; |