staging: vt6655: CARDbSetPhyParameter change CARD_PHY_TYPE to bb_type

using u8 for bb_type

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 7b2596960dc4a140f4da1948811fac5e6a3e79d9..6a1efd152e36db16eb5c4392fdc74082861e1cc6 100644 (file)
--- a/drivers/staging/vt6655/card.c
+++ b/drivers/staging/vt6655/card.c
@@ -204,7 +204,7 @@ s_vCalculateOFDMRParameter(
  *
  * Return Value: None.
  */
-bool CARDbSetPhyParameter(struct vnt_private *pDevice, CARD_PHY_TYPE ePHYType,
+bool CARDbSetPhyParameter(struct vnt_private *pDevice, u8 bb_type,
                          unsigned short wCapInfo, unsigned char byERPField,
                          void *pvSupportRateIEs, void *pvExtSupportRateIEs)
 {
@@ -216,7 +216,7 @@ bool CARDbSetPhyParameter(struct vnt_private *pDevice, CARD_PHY_TYPE ePHYType,
        int i;
 
        /* Set SIFS, DIFS, EIFS, SlotTime, CwMin */
-       if (ePHYType == PHY_TYPE_11A) {
+       if (bb_type == BB_TYPE_11A) {
                if (pDevice->byRFType == RF_AIROHA7230) {
                        /* AL7230 use single PAPE and connect to PAPE_2.4G */
                        MACvSetBBType(pDevice->PortOffset, BB_TYPE_11G);
@@ -243,7 +243,7 @@ bool CARDbSetPhyParameter(struct vnt_private *pDevice, CARD_PHY_TYPE ePHYType,
                bySIFS = C_SIFS_A;
                byDIFS = C_SIFS_A + 2*C_SLOT_SHORT;
                byCWMaxMin = 0xA4;
-       } else if (ePHYType == PHY_TYPE_11B) {
+       } else if (bb_type == BB_TYPE_11B) {
                MACvSetBBType(pDevice->PortOffset, BB_TYPE_11B);
                if (pDevice->byRFType == RF_AIROHA7230) {
                        pDevice->abyBBVGA[0] = 0x1C;
@@ -344,7 +344,7 @@ bool CARDbSetPhyParameter(struct vnt_private *pDevice, CARD_PHY_TYPE ePHYType,
 
        pDevice->byPacketType = CARDbyGetPktType(pDevice);
 
-       CARDvSetRSPINF(pDevice, ePHYType);
+       CARDvSetRSPINF(pDevice, bb_type);
 
        return true;
 }

diff --git a/drivers/staging/vt6655/card.h b/drivers/staging/vt6655/card.h
index 2449f3cb56961d2d1d8837e8771ba5d6a58d5487..9d19f9761c59f589d362d2be9c60334a6cd5bd9b 100644 (file)
--- a/drivers/staging/vt6655/card.h
+++ b/drivers/staging/vt6655/card.h
@@ -89,7 +89,7 @@ void CARDvSafeResetTx(struct vnt_private *);
 void CARDvSafeResetRx(struct vnt_private *);
 bool CARDbRadioPowerOff(struct vnt_private *);
 bool CARDbRadioPowerOn(struct vnt_private *);
-bool CARDbSetPhyParameter(struct vnt_private *, CARD_PHY_TYPE ePHYType,
+bool CARDbSetPhyParameter(struct vnt_private *, u8,
                          unsigned short wCapInfo, unsigned char byERPField,
                          void *pvSupportRateIEs, void *pvExtSupportRateIEs);
 bool CARDbUpdateTSF(struct vnt_private *, unsigned char byRxRate,