diff options
| author |   Charles Clément <caratorn@gmail.com> | 2010-05-20 11:08:55 -0700 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@suse.de> | 2010-06-18 10:07:48 -0700 |
| commit | 6b1e6b8f957386e60e3fac15a64518c8f7ce5a69 (patch) | |
| tree | ca71ec85af6243485e5ab24c6ce60e8c0bb98676 /drivers/staging/vt6655 | |
| parent | Staging: vt6655: use compare_ether_addr instead of custom macro (diff) | |
| download | linux-dev-6b1e6b8f957386e60e3fac15a64518c8f7ce5a69.tar.xz linux-dev-6b1e6b8f957386e60e3fac15a64518c8f7ce5a69.zip | |
Staging: vt6655: remove unused argument in ChannelValid function
Signed-off-by: Charles Clément <caratorn@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/vt6655')
| -rw-r--r-- | drivers/staging/vt6655/card.c | 5 | ||||
| -rw-r--r-- | drivers/staging/vt6655/card.h | 2 | ||||
| -rw-r--r-- | drivers/staging/vt6655/wcmd.c | 4 |
3 files changed, 5 insertions, 6 deletions
diff --git a/drivers/staging/vt6655/card.c b/drivers/staging/vt6655/card.c index de5f2ba2cf46..f239920d7f23 100644 --- a/drivers/staging/vt6655/card.c +++ b/drivers/staging/vt6655/card.c @@ -440,8 +440,7 @@ s_vCaculateOFDMRParameter( /*--------------------- Export function -------------------------*/ /************************************************************************ * Country Channel Valid - * Input: CountryCode, ChannelNum - * ChanneIndex is defined as VT3253 MAC channel: + * Input: ChannelIndex is defined as VT3253 MAC channel: * 1 = 2.4G channel 1 * 2 = 2.4G channel 2 * ... @@ -458,7 +457,7 @@ s_vCaculateOFDMRParameter( ************************************************************************/ //2008-8-4 <add> by chester BOOL -ChannelValid(UINT CountryCode, UINT ChannelIndex) +ChannelValid(UINT ChannelIndex) { BOOL bValid; diff --git a/drivers/staging/vt6655/card.h b/drivers/staging/vt6655/card.h index 76313462cf76..d2207bfbe11f 100644 --- a/drivers/staging/vt6655/card.h +++ b/drivers/staging/vt6655/card.h @@ -86,7 +86,7 @@ typedef enum _CARD_OP_MODE { /*--------------------- Export Functions --------------------------*/ -BOOL ChannelValid(UINT CountryCode, UINT ChannelIndex); +BOOL ChannelValid(UINT ChannelIndex); void CARDvSetRSPINF(void *pDeviceHandler, CARD_PHY_TYPE ePHYType); void vUpdateIFS(void *pDeviceHandler); void CARDvUpdateBasicTopRate(void *pDeviceHandler); diff --git a/drivers/staging/vt6655/wcmd.c b/drivers/staging/vt6655/wcmd.c index 28665d870f59..c2bf287961a9 100644 --- a/drivers/staging/vt6655/wcmd.c +++ b/drivers/staging/vt6655/wcmd.c @@ -408,7 +408,7 @@ vCommandTimer ( } else { //2008-8-4 <add> by chester - if (!ChannelValid(pDevice->byZoneType, pMgmt->uScanChannel)) { + if (!ChannelValid(pMgmt->uScanChannel)) { DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Invalid channel pMgmt->uScanChannel = %d \n",pMgmt->uScanChannel); s_bCommandComplete(pDevice); return; @@ -441,7 +441,7 @@ vCommandTimer ( // printk("chester-ch=%d\n",pMgmt->uScanChannel); pMgmt->uScanChannel++; //2008-8-4 <modify> by chester - if (!ChannelValid(pDevice->byZoneType, pMgmt->uScanChannel) && + if (!ChannelValid(pMgmt->uScanChannel) && pMgmt->uScanChannel <= pDevice->byMaxChannel ){ pMgmt->uScanChannel=pDevice->byMaxChannel+1; pMgmt->eCommandState = WLAN_CMD_SCAN_END; |