---

yaml --- r: 205579 b: refs/heads/master c: 6b1e6b8 h: refs/heads/master i: 205577: 3e31e87 205575: e3746c8 v: v3
git-mirror · Jun 18, 2010 · a11a738 · a11a738
1 parent 81c548e
commit a11a738
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2ef98c606516be4efb176c3c5e339b769ca1833a
+refs/heads/master: 6b1e6b8f957386e60e3fac15a64518c8f7ce5a69
diff --git a/trunk/drivers/staging/vt6655/card.c b/trunk/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/trunk/drivers/staging/vt6655/card.h b/trunk/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/trunk/drivers/staging/vt6655/wcmd.c b/trunk/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;