Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 281416
b: refs/heads/master
c: 0ae3a91
h: refs/heads/master
v: v3
  • Loading branch information
Marcos Paulo de Souza authored and Greg Kroah-Hartman committed Dec 22, 2011
1 parent 39f27c0 commit 58ca432
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 10 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: ba768b917f8c4c995471681d6eaa3b1546f681c7
refs/heads/master: 0ae3a912d8beabb2fd9bf81054b88aa8dc40feb5
10 changes: 2 additions & 8 deletions trunk/drivers/staging/vt6656/card.c
Original file line number Diff line number Diff line change
Expand Up @@ -91,15 +91,10 @@ const WORD cwRXBCNTSFOff[MAX_RATE] =
* uConnectionChannel - Channel to be set
* Out:
* none
*
* Return Value: TRUE if succeeded; FALSE if failed.
*
*/
BOOL CARDbSetMediaChannel(void *pDeviceHandler, unsigned int uConnectionChannel)
void CARDbSetMediaChannel(void *pDeviceHandler, unsigned int uConnectionChannel)
{
PSDevice pDevice = (PSDevice) pDeviceHandler;
BOOL bResult = TRUE;


if (pDevice->byBBType == BB_TYPE_11A) { // 15 ~ 38
if ((uConnectionChannel < (CB_MAX_CHANNEL_24G+1)) || (uConnectionChannel > CB_MAX_CHANNEL))
Expand Down Expand Up @@ -140,7 +135,6 @@ BOOL bResult = TRUE;
RFbRawSetPower(pDevice, pDevice->abyCCKPwrTbl[uConnectionChannel-1], RATE_1M);
}
ControlvWriteByte(pDevice,MESSAGE_REQUEST_MACREG,MAC_REG_CHANNEL,(BYTE)(uConnectionChannel|0x80));
return(bResult);
}

/*
Expand Down Expand Up @@ -1088,7 +1082,7 @@ CARDbChannelSwitch (

if (byCount == 0) {
pDevice->sMgmtObj.uCurrChannel = byNewChannel;
bResult = CARDbSetMediaChannel(pDevice, byNewChannel);
CARDbSetMediaChannel(pDevice, byNewChannel);

return bResult;
}
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/vt6656/card.h
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ typedef enum _CARD_OP_MODE {

/*--------------------- Export Functions --------------------------*/

BOOL CARDbSetMediaChannel(void *pDeviceHandler,
void CARDbSetMediaChannel(void *pDeviceHandler,
unsigned int uConnectionChannel);
void CARDvSetRSPINF(void *pDeviceHandler, BYTE byBBType);
void vUpdateIFS(void *pDeviceHandler);
Expand Down

0 comments on commit 58ca432

Please sign in to comment.