iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Staging: vt6655: remove unused argument in ChannelValid function

Browse Source 
Signed-off-by: Charles Clément <caratorn@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Charles Clément 2010-05-20 11:08:55 -07:00 committed by Greg Kroah-Hartman
parent 2ef98c6065
commit 6b1e6b8f95
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/staging/vt6655/card.c
View File

@ -440,8 +440,7 @@ s_vCaculateOFDMRParameter(
/*--------------------- Export function -------------------------*/ /*--------------------- Export function -------------------------*/
/************************************************************************ /************************************************************************
* Country Channel Valid * Country Channel Valid
* Input: CountryCode, ChannelNum * Input: ChannelIndex is defined as VT3253 MAC channel:
* ChanneIndex is defined as VT3253 MAC channel:
* 1 = 2.4G channel 1 * 1 = 2.4G channel 1
* 2 = 2.4G channel 2 * 2 = 2.4G channel 2
* ... * ...
@ -458,7 +457,7 @@ s_vCaculateOFDMRParameter(
************************************************************************/ ************************************************************************/
//2008-8-4 <add> by chester //2008-8-4 <add> by chester
BOOL BOOL
ChannelValid(UINT CountryCode, UINT ChannelIndex) ChannelValid(UINT ChannelIndex)
{ {
BOOL bValid; BOOL bValid;

2
drivers/staging/vt6655/card.h
View File

@ -86,7 +86,7 @@ typedef enum _CARD_OP_MODE {
/*--------------------- Export Functions --------------------------*/ /*--------------------- Export Functions --------------------------*/
BOOL ChannelValid(UINT CountryCode, UINT ChannelIndex); BOOL ChannelValid(UINT ChannelIndex);
void CARDvSetRSPINF(void *pDeviceHandler, CARD_PHY_TYPE ePHYType); void CARDvSetRSPINF(void *pDeviceHandler, CARD_PHY_TYPE ePHYType);
void vUpdateIFS(void *pDeviceHandler); void vUpdateIFS(void *pDeviceHandler);
void CARDvUpdateBasicTopRate(void *pDeviceHandler); void CARDvUpdateBasicTopRate(void *pDeviceHandler);

4
drivers/staging/vt6655/wcmd.c
View File

@ -408,7 +408,7 @@ vCommandTimer (
} else { } else {
//2008-8-4 <add> by chester //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); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Invalid channel pMgmt->uScanChannel = %d \n",pMgmt->uScanChannel);
s_bCommandComplete(pDevice); s_bCommandComplete(pDevice);
return; return;
@ -441,7 +441,7 @@ vCommandTimer (
// printk("chester-ch=%d\n",pMgmt->uScanChannel); // printk("chester-ch=%d\n",pMgmt->uScanChannel);
pMgmt->uScanChannel++; pMgmt->uScanChannel++;
//2008-8-4 <modify> by chester //2008-8-4 <modify> by chester
if (!ChannelValid(pDevice->byZoneType, pMgmt->uScanChannel) && if (!ChannelValid(pMgmt->uScanChannel) &&
pMgmt->uScanChannel <= pDevice->byMaxChannel ){ pMgmt->uScanChannel <= pDevice->byMaxChannel ){
pMgmt->uScanChannel=pDevice->byMaxChannel+1; pMgmt->uScanChannel=pDevice->byMaxChannel+1;
pMgmt->eCommandState = WLAN_CMD_SCAN_END; pMgmt->eCommandState = WLAN_CMD_SCAN_END;