From 58ca432844e2588984517112b47e4c34ec34123a Mon Sep 17 00:00:00 2001 From: Marcos Paulo de Souza Date: Sun, 18 Dec 2011 21:12:15 +0000 Subject: [PATCH] --- yaml --- r: 281416 b: refs/heads/master c: 0ae3a912d8beabb2fd9bf81054b88aa8dc40feb5 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/vt6656/card.c | 10 ++-------- trunk/drivers/staging/vt6656/card.h | 2 +- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index a804d1e708ed..16c5c1b34e4e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ba768b917f8c4c995471681d6eaa3b1546f681c7 +refs/heads/master: 0ae3a912d8beabb2fd9bf81054b88aa8dc40feb5 diff --git a/trunk/drivers/staging/vt6656/card.c b/trunk/drivers/staging/vt6656/card.c index 1574e8e49d1a..9d09e9fd8e18 100644 --- a/trunk/drivers/staging/vt6656/card.c +++ b/trunk/drivers/staging/vt6656/card.c @@ -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)) @@ -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); } /* @@ -1088,7 +1082,7 @@ CARDbChannelSwitch ( if (byCount == 0) { pDevice->sMgmtObj.uCurrChannel = byNewChannel; - bResult = CARDbSetMediaChannel(pDevice, byNewChannel); + CARDbSetMediaChannel(pDevice, byNewChannel); return bResult; } diff --git a/trunk/drivers/staging/vt6656/card.h b/trunk/drivers/staging/vt6656/card.h index c5795708ad5c..9cf71a3d8801 100644 --- a/trunk/drivers/staging/vt6656/card.h +++ b/trunk/drivers/staging/vt6656/card.h @@ -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);