staging: vt6655: mac80211 conversion: changes to set channel

Remove call to sChannelTbl, the channel under mac80211 is always valid.

CARDbSetPhyParameter is nolonger set here.

RFbSetPower is now set on byBBType

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/vt6655/channel.c b/drivers/staging/vt6655/channel.c
index 4b3c798..2379696 100644 (file)
--- a/drivers/staging/vt6655/channel.c
+++ b/drivers/staging/vt6655/channel.c
@@ -665,16 +665,6 @@ bool set_channel(void *pDeviceHandler, unsigned int uConnectionChannel)
        if (pDevice->byCurrentCh == uConnectionChannel)
                return bResult;
 
-       if (!sChannelTbl[uConnectionChannel].bValid)
-               return false;
-
-       if ((uConnectionChannel > CB_MAX_CHANNEL_24G) &&
-           (pDevice->eCurrentPHYType != PHY_TYPE_11A)) {
-               CARDbSetPhyParameter(pDevice, PHY_TYPE_11A, 0, 0, NULL, NULL);
-       } else if ((uConnectionChannel <= CB_MAX_CHANNEL_24G) &&
-                  (pDevice->eCurrentPHYType == PHY_TYPE_11A)) {
-               CARDbSetPhyParameter(pDevice, PHY_TYPE_11G, 0, 0, NULL, NULL);
-       }
        /* clear NAV */
        MACvRegBitsOn(pDevice->PortOffset, MAC_REG_MACCR, MACCR_CLRNAV);
 
@@ -702,7 +692,7 @@ bool set_channel(void *pDeviceHandler, unsigned int uConnectionChannel)
                MACvSelectPage0(pDevice->PortOffset);
        }
 
-       if (pDevice->eCurrentPHYType == PHY_TYPE_11B)
+       if (pDevice->byBBType == BB_TYPE_11B)
                RFbSetPower(pDevice, RATE_1M, pDevice->byCurrentCh);
        else
                RFbSetPower(pDevice, RATE_6M, pDevice->byCurrentCh);