Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6b1e6b8f authored by Charles Clément's avatar Charles Clément Committed by Greg Kroah-Hartman
Browse files

Staging: vt6655: remove unused argument in ChannelValid function 



Signed-off-by: default avatarCharles Clément <caratorn@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 2ef98c60

drivers/staging/vt6655/card.c

+2 −3
Original line number Diff line number Diff line
@@ -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;

drivers/staging/vt6655/card.h

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/staging/vt6655/wcmd.c

+2 −2
Original line number Diff line number Diff line
@@ -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;