aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/staging/vt6656/card.c10
-rw-r--r--drivers/staging/vt6656/card.h2
2 files changed, 3 insertions, 9 deletions
diff --git a/drivers/staging/vt6656/card.c b/drivers/staging/vt6656/card.c
index 1574e8e49d1..9d09e9fd8e1 100644
--- a/drivers/staging/vt6656/card.c
+++ b/drivers/staging/vt6656/card.c
@@ -91,15 +91,10 @@ const WORD cwRXBCNTSFOff[MAX_RATE] =
91 * uConnectionChannel - Channel to be set 91 * uConnectionChannel - Channel to be set
92 * Out: 92 * Out:
93 * none 93 * none
94 *
95 * Return Value: TRUE if succeeded; FALSE if failed.
96 *
97 */ 94 */
98BOOL CARDbSetMediaChannel(void *pDeviceHandler, unsigned int uConnectionChannel) 95void CARDbSetMediaChannel(void *pDeviceHandler, unsigned int uConnectionChannel)
99{ 96{
100PSDevice pDevice = (PSDevice) pDeviceHandler; 97PSDevice pDevice = (PSDevice) pDeviceHandler;
101BOOL bResult = TRUE;
102
103 98
104 if (pDevice->byBBType == BB_TYPE_11A) { // 15 ~ 38 99 if (pDevice->byBBType == BB_TYPE_11A) { // 15 ~ 38
105 if ((uConnectionChannel < (CB_MAX_CHANNEL_24G+1)) || (uConnectionChannel > CB_MAX_CHANNEL)) 100 if ((uConnectionChannel < (CB_MAX_CHANNEL_24G+1)) || (uConnectionChannel > CB_MAX_CHANNEL))
@@ -140,7 +135,6 @@ BOOL bResult = TRUE;
140 RFbRawSetPower(pDevice, pDevice->abyCCKPwrTbl[uConnectionChannel-1], RATE_1M); 135 RFbRawSetPower(pDevice, pDevice->abyCCKPwrTbl[uConnectionChannel-1], RATE_1M);
141 } 136 }
142 ControlvWriteByte(pDevice,MESSAGE_REQUEST_MACREG,MAC_REG_CHANNEL,(BYTE)(uConnectionChannel|0x80)); 137 ControlvWriteByte(pDevice,MESSAGE_REQUEST_MACREG,MAC_REG_CHANNEL,(BYTE)(uConnectionChannel|0x80));
143 return(bResult);
144} 138}
145 139
146/* 140/*
@@ -1088,7 +1082,7 @@ CARDbChannelSwitch (
1088 1082
1089 if (byCount == 0) { 1083 if (byCount == 0) {
1090 pDevice->sMgmtObj.uCurrChannel = byNewChannel; 1084 pDevice->sMgmtObj.uCurrChannel = byNewChannel;
1091 bResult = CARDbSetMediaChannel(pDevice, byNewChannel); 1085 CARDbSetMediaChannel(pDevice, byNewChannel);
1092 1086
1093 return bResult; 1087 return bResult;
1094 } 1088 }
diff --git a/drivers/staging/vt6656/card.h b/drivers/staging/vt6656/card.h
index c5795708ad5..9cf71a3d880 100644
--- a/drivers/staging/vt6656/card.h
+++ b/drivers/staging/vt6656/card.h
@@ -60,7 +60,7 @@ typedef enum _CARD_OP_MODE {
60 60
61/*--------------------- Export Functions --------------------------*/ 61/*--------------------- Export Functions --------------------------*/
62 62
63BOOL CARDbSetMediaChannel(void *pDeviceHandler, 63void CARDbSetMediaChannel(void *pDeviceHandler,
64 unsigned int uConnectionChannel); 64 unsigned int uConnectionChannel);
65void CARDvSetRSPINF(void *pDeviceHandler, BYTE byBBType); 65void CARDvSetRSPINF(void *pDeviceHandler, BYTE byBBType);
66void vUpdateIFS(void *pDeviceHandler); 66void vUpdateIFS(void *pDeviceHandler);