staging: vt6655: s_vCalculateOFDMRParameter use bb_type for CARD_PHY_TYPE
using u8 for bb_type and replacing PHY_TYPE_11A with BB_TYPE_11A
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
diff --git a/drivers/staging/vt6655/card.c b/drivers/staging/vt6655/card.c
index 24ba9d4..e6e5f63 100644
--- a/drivers/staging/vt6655/card.c
+++ b/drivers/staging/vt6655/card.c
@@ -78,7 +78,7 @@
void
s_vCalculateOFDMRParameter(
unsigned char byRate,
- CARD_PHY_TYPE ePHYType,
+ u8 bb_type,
unsigned char *pbyTxRate,
unsigned char *pbyRsvTime
);
@@ -102,14 +102,14 @@
void
s_vCalculateOFDMRParameter(
unsigned char byRate,
- CARD_PHY_TYPE ePHYType,
+ u8 bb_type,
unsigned char *pbyTxRate,
unsigned char *pbyRsvTime
)
{
switch (byRate) {
case RATE_6M:
- if (ePHYType == PHY_TYPE_11A) { /* 5GHZ */
+ if (bb_type == BB_TYPE_11A) { /* 5GHZ */
*pbyTxRate = 0x9B;
*pbyRsvTime = 44;
} else {
@@ -119,7 +119,7 @@
break;
case RATE_9M:
- if (ePHYType == PHY_TYPE_11A) { /* 5GHZ */
+ if (bb_type == BB_TYPE_11A) { /* 5GHZ */
*pbyTxRate = 0x9F;
*pbyRsvTime = 36;
} else {
@@ -129,7 +129,7 @@
break;
case RATE_12M:
- if (ePHYType == PHY_TYPE_11A) { /* 5GHZ */
+ if (bb_type == BB_TYPE_11A) { /* 5GHZ */
*pbyTxRate = 0x9A;
*pbyRsvTime = 32;
} else {
@@ -139,7 +139,7 @@
break;
case RATE_18M:
- if (ePHYType == PHY_TYPE_11A) { /* 5GHZ */
+ if (bb_type == BB_TYPE_11A) { /* 5GHZ */
*pbyTxRate = 0x9E;
*pbyRsvTime = 28;
} else {
@@ -149,7 +149,7 @@
break;
case RATE_36M:
- if (ePHYType == PHY_TYPE_11A) { /* 5GHZ */
+ if (bb_type == BB_TYPE_11A) { /* 5GHZ */
*pbyTxRate = 0x9D;
*pbyRsvTime = 24;
} else {
@@ -159,7 +159,7 @@
break;
case RATE_48M:
- if (ePHYType == PHY_TYPE_11A) { /* 5GHZ */
+ if (bb_type == BB_TYPE_11A) { /* 5GHZ */
*pbyTxRate = 0x98;
*pbyRsvTime = 24;
} else {
@@ -169,7 +169,7 @@
break;
case RATE_54M:
- if (ePHYType == PHY_TYPE_11A) { /* 5GHZ */
+ if (bb_type == BB_TYPE_11A) { /* 5GHZ */
*pbyTxRate = 0x9C;
*pbyRsvTime = 24;
} else {
@@ -180,7 +180,7 @@
case RATE_24M:
default:
- if (ePHYType == PHY_TYPE_11A) { /* 5GHZ */
+ if (bb_type == BB_TYPE_11A) { /* 5GHZ */
*pbyTxRate = 0x99;
*pbyRsvTime = 28;
} else {