[PATCH v2 17/34] staging: vt6655: mac80211 conversion: card.c use basic_rates

[Malcolm Priestley]

Use basic_rates to find cck and ofdm rates.

wBasicRate will be removed later.

Signed-off-by: Malcolm Priestley <tvbox...@gmail.com>
---
 drivers/staging/vt6655/card.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/vt6655/card.c b/drivers/staging/vt6655/card.c
index 090c286..a1330bc 100644
--- a/drivers/staging/vt6655/card.c
+++ b/drivers/staging/vt6655/card.c
@@ -1457,7 +1457,7 @@ static unsigned short CARDwGetCCKControlRate(struct 
vnt_private *pDevice,
        unsigned int ui = (unsigned int) wRateIdx;
 
        while (ui > RATE_1M) {
-               if (pDevice->wBasicRate & ((unsigned short)1 << ui))
+               if (pDevice->basic_rates & ((u32)0x1 << ui))
                        return (unsigned short)ui;
 
                ui--;
@@ -1482,7 +1482,7 @@ static unsigned short CARDwGetOFDMControlRate(struct 
vnt_private *pDevice,
 {
        unsigned int ui = (unsigned int) wRateIdx;
 
-       pr_debug("BASIC RATE: %X\n", pDevice->wBasicRate);
+       pr_debug("BASIC RATE: %X\n", pDevice->basic_rates);
 
        if (!CARDbIsOFDMinBasicRate((void *)pDevice)) {
                pr_debug("CARDwGetOFDMControlRate:(NO OFDM) %d\n", wRateIdx);
@@ -1491,7 +1491,7 @@ static unsigned short CARDwGetOFDMControlRate(struct 
vnt_private *pDevice,
                return wRateIdx;
        }
        while (ui > RATE_11M) {
-               if (pDevice->wBasicRate & ((unsigned short)1 << ui)) {
+               if (pDevice->basic_rates & ((u32)0x1 << ui)) {
                        pr_debug("CARDwGetOFDMControlRate : %d\n", ui);
                        return (unsigned short)ui;
                }
-- 
2.1.0

--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html