From c01ef29e38362518e269e35c3bce090a3d60fa5b Mon Sep 17 00:00:00 2001 From: Malcolm Priestley Date: Wed, 29 Oct 2014 17:43:52 +0000 Subject: [PATCH] staging: vt6655: mac80211 conversion: card.c use basic_rates Use basic_rates to find cck and ofdm rates. wBasicRate will be removed later. Signed-off-by: Malcolm Priestley Signed-off-by: Greg Kroah-Hartman --- 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 090c28618ec9..a1330bce63ff 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.11.0