From f2046f93db0918f99875853772142143590ba0c6 Mon Sep 17 00:00:00 2001 From: Joe Perches Date: Mon, 18 Mar 2013 20:55:36 -0700 Subject: [PATCH] staging: vt6655: Remove commented out printks These are just noise in the code so remove them. Signed-off-by: Joe Perches Signed-off-by: Greg Kroah-Hartman --- drivers/staging/vt6655/baseband.c | 27 ++----------------- drivers/staging/vt6655/bssdb.c | 8 ------ drivers/staging/vt6655/channel.c | 7 ----- drivers/staging/vt6655/device.h | 4 --- drivers/staging/vt6655/device_main.c | 39 +++------------------------- drivers/staging/vt6655/dpc.c | 15 +---------- drivers/staging/vt6655/iwctl.c | 1 - drivers/staging/vt6655/rf.c | 5 ---- drivers/staging/vt6655/rxtx.c | 8 ------ drivers/staging/vt6655/wcmd.c | 10 ------- drivers/staging/vt6655/wmgr.c | 3 --- drivers/staging/vt6655/wpactl.c | 9 ------- 12 files changed, 6 insertions(+), 130 deletions(-) diff --git a/drivers/staging/vt6655/baseband.c b/drivers/staging/vt6655/baseband.c index 6f33e94dc16e..1435bac19bd2 100644 --- a/drivers/staging/vt6655/baseband.c +++ b/drivers/staging/vt6655/baseband.c @@ -1732,10 +1732,6 @@ s_vChangeAntenna( PSDevice pDevice ) { - -#ifdef PLICE_DEBUG - //printk("Enter s_vChangeAntenna:original RxMode is %d,TxMode is %d\n",pDevice->byRxAntennaMode,pDevice->byTxAntennaMode); -#endif if (pDevice->dwRxAntennaSel == 0) { pDevice->dwRxAntennaSel = 1; if (pDevice->bTxRxAntInv == true) @@ -2564,9 +2560,6 @@ BBvSetTxAntennaMode(unsigned long dwIoBase, unsigned char byAntennaMode) { unsigned char byBBTxConf; -#ifdef PLICE_DEBUG - //printk("Enter BBvSetTxAntennaMode\n"); -#endif BBbReadEmbedded(dwIoBase, 0x09, &byBBTxConf);//CR09 if (byAntennaMode == ANT_DIVERSITY) { // bit 1 is diversity @@ -2575,9 +2568,6 @@ BBvSetTxAntennaMode(unsigned long dwIoBase, unsigned char byAntennaMode) // bit 2 is ANTSEL byBBTxConf &= 0xF9; // 1111 1001 } else if (byAntennaMode == ANT_B) { -#ifdef PLICE_DEBUG - //printk("BBvSetTxAntennaMode:ANT_B\n"); -#endif byBBTxConf &= 0xFD; // 1111 1101 byBBTxConf |= 0x04; } @@ -2812,9 +2802,7 @@ BBvAntennaDiversity(PSDevice pDevice, unsigned char byRxRate, unsigned char bySQ DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "1.[%08x], uNumSQ3[%d]=%d, %d\n", (int)pDevice->ulRatio_State0, (int)pDevice->wAntDiversityMaxRate, (int)pDevice->uNumSQ3[(int)pDevice->wAntDiversityMaxRate], (int)pDevice->uDiversityCnt); -#ifdef PLICE_DEBUG - //printk("BBvAntennaDiversity1:call s_vChangeAntenna\n"); -#endif + s_vChangeAntenna(pDevice); pDevice->byAntennaState = 1; del_timer(&pDevice->TimerSQ3Tmax3); @@ -2845,9 +2833,7 @@ BBvAntennaDiversity(PSDevice pDevice, unsigned char byRxRate, unsigned char bySQ (int)pDevice->ulRatio_State0, (int)pDevice->ulRatio_State1, (int)pDevice->wAntDiversityMaxRate, (int)pDevice->uNumSQ3[(int)pDevice->wAntDiversityMaxRate], (int)pDevice->uDiversityCnt); -#ifdef PLICE_DEBUG - //printk("BBvAntennaDiversity2:call s_vChangeAntenna\n"); -#endif + s_vChangeAntenna(pDevice); pDevice->TimerSQ3Tmax3.expires = RUN_AT(pDevice->byTMax3 * HZ); pDevice->TimerSQ3Tmax2.expires = RUN_AT(pDevice->byTMax2 * HZ); @@ -2885,9 +2871,6 @@ TimerSQ3CallBack( spin_lock_irq(&pDevice->lock); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "3.[%08x][%08x], %d\n", (int)pDevice->ulRatio_State0, (int)pDevice->ulRatio_State1, (int)pDevice->uDiversityCnt); -#ifdef PLICE_DEBUG - //printk("TimerSQ3CallBack1:call s_vChangeAntenna\n"); -#endif s_vChangeAntenna(pDevice); pDevice->byAntennaState = 0; @@ -2933,9 +2916,6 @@ TimerState1CallBack( spin_lock_irq(&pDevice->lock); if (pDevice->uDiversityCnt < pDevice->ulDiversityMValue/100) { -#ifdef PLICE_DEBUG - //printk("TimerSQ3CallBack2:call s_vChangeAntenna\n"); -#endif s_vChangeAntenna(pDevice); pDevice->TimerSQ3Tmax3.expires = RUN_AT(pDevice->byTMax3 * HZ); @@ -2952,9 +2932,6 @@ TimerState1CallBack( (int)pDevice->ulRatio_State0, (int)pDevice->ulRatio_State1, (int)pDevice->wAntDiversityMaxRate, (int)pDevice->uNumSQ3[(int)pDevice->wAntDiversityMaxRate], (int)pDevice->uDiversityCnt); -#ifdef PLICE_DEBUG - //printk("TimerSQ3CallBack3:call s_vChangeAntenna\n"); -#endif s_vChangeAntenna(pDevice); diff --git a/drivers/staging/vt6655/bssdb.c b/drivers/staging/vt6655/bssdb.c index 3bb3e7fa82e8..da9b1779ca25 100644 --- a/drivers/staging/vt6655/bssdb.c +++ b/drivers/staging/vt6655/bssdb.c @@ -1413,12 +1413,7 @@ BSSvUpdateNodeTxCounter( byFallBack = AUTO_FB_NONE; } wRate = pTxBufHead->wReserved; //?wRate - //printk("BSSvUpdateNodeTxCounter:byTxRetry is %d\n",byTxRetry); -//printk("BSSvUpdateNodeTx:wRate is %d,byFallback is %d\n",wRate,byFallBack); -//#ifdef PLICE_DEBUG - //printk("BSSvUpdateNodeTx: wRate is %d\n",wRate); -////#endif // Only Unicast using support rates if (pTxBufHead->wFIFOCtl & FIFOCTL_NEEDACK) { DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "wRate %04X, byTsr0 %02X, byTsr1 %02X\n", wRate, byTsr0, byTsr1); @@ -1466,13 +1461,11 @@ BSSvUpdateNodeTxCounter( //PLICE_DEBUG wFallBackRate = awHWRetry0[wRate-RATE_18M][ii]; - //printk(" II is %d:BSSvUpdateNodeTx:wFallBackRate is %d\n",ii,wFallBackRate); //wFallBackRate = awHWRetry0[wRate-RATE_12M][ii]; } else { wFallBackRate = awHWRetry0[wRate-RATE_18M][4]; - //printk("ii is %d BSSvUpdateNodeTx:wFallBackRate is %d\n",ii,wFallBackRate); //wFallBackRate = awHWRetry0[wRate-RATE_12M][4]; } pMgmt->sNodeDBTable[0].uTxFail[wFallBackRate]++; @@ -1686,7 +1679,6 @@ void s_uCalculateLinkQual( //decide link quality if (pDevice->bLinkPass != true) { - // printk("s_uCalculateLinkQual-->Link disconnect and Poor quality**\n"); pDevice->scStatistic.LinkQuality = 0; pDevice->scStatistic.SignalStren = 0; } diff --git a/drivers/staging/vt6655/channel.c b/drivers/staging/vt6655/channel.c index 569c648f481d..0005de8b795e 100644 --- a/drivers/staging/vt6655/channel.c +++ b/drivers/staging/vt6655/channel.c @@ -433,7 +433,6 @@ void init_channel_table(void *pDeviceHandler) case RF_AL2230S: case RF_UW2451: case RF_VT3226: - //printk("chester-false\n"); bMultiBand = false; break; case RF_AIROHA7230: @@ -581,14 +580,8 @@ bool set_channel(void *pDeviceHandler, unsigned int uConnectionChannel) } if (pDevice->eCurrentPHYType == PHY_TYPE_11B) { -#ifdef PLICE_DEBUG - //printk("Func:ChbSetChannel:call RFbSetPower:11B\n"); -#endif RFbSetPower(pDevice, RATE_1M, pDevice->byCurrentCh); } else { -#ifdef PLICE_DEBUG - //printk("Func:ChbSetChannel:call RFbSetPower\n"); -#endif RFbSetPower(pDevice, RATE_6M, pDevice->byCurrentCh); } diff --git a/drivers/staging/vt6655/device.h b/drivers/staging/vt6655/device.h index 0d9b0ddc0183..23e5f1365ae6 100644 --- a/drivers/staging/vt6655/device.h +++ b/drivers/staging/vt6655/device.h @@ -815,10 +815,8 @@ typedef struct __device_info { inline static void EnQueue(PSDevice pDevice, PSRxMgmtPacket pRxMgmtPacket) { - //printk("Enter EnQueue:tail is %d\n",pDevice->rxManeQueue.tail); if ((pDevice->rxManeQueue.tail+1) % NUM == pDevice->rxManeQueue.head) { - //printk("Queue is Full,tail is %d\n",pDevice->rxManeQueue.tail); return; } else @@ -826,7 +824,6 @@ inline static void EnQueue(PSDevice pDevice, PSRxMgmtPacket pRxMgmtPacket) pDevice->rxManeQueue.tail = (pDevice->rxManeQueue.tail + 1) % NUM; pDevice->rxManeQueue.Q[pDevice->rxManeQueue.tail] = pRxMgmtPacket; pDevice->rxManeQueue.packet_num++; - //printk("packet num is %d\n",pDevice->rxManeQueue.packet_num); } } @@ -847,7 +844,6 @@ inline static PSRxMgmtPacket DeQueue(PSDevice pDevice) //x=pDevice->rxManeQueue.head = (pDevice->rxManeQueue.head+1)%NUM; pDevice->rxManeQueue.head = (pDevice->rxManeQueue.head+1)%NUM; x = pDevice->rxManeQueue.head; - //printk("Enter DeQueue:head is %d\n",x); pRxMgmtPacket = pDevice->rxManeQueue.Q[x]; pDevice->rxManeQueue.packet_num--; return pRxMgmtPacket; diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c index 10d675e9e084..dcc639f44690 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c @@ -570,16 +570,11 @@ static void device_init_registers(PSDevice pDevice, DEVICE_INIT_TYPE InitType) pDevice->bTxRxAntInv = true; else pDevice->bTxRxAntInv = false; -#ifdef PLICE_DEBUG - //printk("init_register:TxRxAntInv is %d,byValue is %d\n",pDevice->bTxRxAntInv,byValue); -#endif byValue &= (EEP_ANTENNA_AUX | EEP_ANTENNA_MAIN); if (byValue == 0) // if not set default is All byValue = (EEP_ANTENNA_AUX | EEP_ANTENNA_MAIN); -#ifdef PLICE_DEBUG - //printk("init_register:byValue is %d\n",byValue); -#endif + pDevice->ulDiversityNValue = 100*260;//100*SROMbyReadEmbedded(pDevice->PortOffset, 0x51); pDevice->ulDiversityMValue = 100*16;//SROMbyReadEmbedded(pDevice->PortOffset, 0x52); pDevice->byTMax = 1;//SROMbyReadEmbedded(pDevice->PortOffset, 0x53); @@ -603,9 +598,6 @@ static void device_init_registers(PSDevice pDevice, DEVICE_INIT_TYPE InitType) pDevice->bDiversityEnable = false;//SROMbyReadEmbedded(pDevice->PortOffset, 0x50); else pDevice->bDiversityEnable = true; -#ifdef PLICE_DEBUG - //printk("aux |main antenna: RxAntennaMode is %d\n",pDevice->byRxAntennaMode); -#endif } else { pDevice->bDiversityEnable = false; pDevice->byAntennaCount = 1; @@ -625,9 +617,6 @@ static void device_init_registers(PSDevice pDevice, DEVICE_INIT_TYPE InitType) pDevice->byRxAntennaMode = ANT_B; } } -#ifdef PLICE_DEBUG - //printk("init registers: TxAntennaMode is %d\n",pDevice->byTxAntennaMode); -#endif DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "bDiversityEnable=[%d],NValue=[%d],MValue=[%d],TMax=[%d],TMax2=[%d]\n", pDevice->bDiversityEnable, (int)pDevice->ulDiversityNValue, (int)pDevice->ulDiversityMValue, pDevice->byTMax, pDevice->byTMax2); @@ -692,7 +681,7 @@ static void device_init_registers(PSDevice pDevice, DEVICE_INIT_TYPE InitType) //byCCKPwrdBm = SROMbyReadEmbedded(pDevice->PortOffset, EEP_OFS_CCK_PWR_dBm); //byOFDMPwrdBm = SROMbyReadEmbedded(pDevice->PortOffset, EEP_OFS_OFDM_PWR_dBm); -//printk("CCKPwrdBm is 0x%x,byOFDMPwrdBm is 0x%x\n",byCCKPwrdBm,byOFDMPwrdBm); + // Load power Table @@ -756,9 +745,6 @@ static void device_init_registers(PSDevice pDevice, DEVICE_INIT_TYPE InitType) pDevice->byBBVGANew = pDevice->byBBVGACurrent; BBvSetVGAGainOffset(pDevice, pDevice->abyBBVGA[0]); } -#ifdef PLICE_DEBUG - //printk("init registers:RxAntennaMode is %x,TxAntennaMode is %x\n",pDevice->byRxAntennaMode,pDevice->byTxAntennaMode); -#endif BBvSetRxAntennaMode(pDevice->PortOffset, pDevice->byRxAntennaMode); BBvSetTxAntennaMode(pDevice->PortOffset, pDevice->byTxAntennaMode); @@ -1162,13 +1148,11 @@ static bool device_get_pci_info(PSDevice pDevice, struct pci_dev *pcid) { #ifdef PLICE_DEBUG //pci_read_config_word(pcid,PCI_MAX_LAT,&max_lat); - //printk("max lat is %x,SubSystemID is %x\n",max_lat,pDevice->SubSystemID); //for (ii=0;ii<0xFF;ii++) //pci_read_config_word(pcid,PCI_MAX_LAT,&max_lat); //max_lat = 0x20; //pci_write_config_word(pcid,PCI_MAX_LAT,max_lat); //pci_read_config_word(pcid,PCI_MAX_LAT,&max_lat); - //printk("max lat is %x\n",max_lat); for (ii = 0; ii < 0xFF; ii++) { @@ -1604,9 +1588,6 @@ static bool device_alloc_rx_buf(PSDevice pDevice, PSRxDesc pRD) { pRDInfo->skb = dev_alloc_skb((int)pDevice->rx_buf_sz); -#ifdef PLICE_DEBUG - //printk("device_alloc_rx_buf:skb is %x\n",pRDInfo->skb); -#endif if (pRDInfo->skb == NULL) return false; ASSERT(pRDInfo->skb); @@ -1828,15 +1809,12 @@ int MlmeThread( PSRxMgmtPacket pRxMgmtPacket; // int i; //complete(&pDevice->notify); -//printk("Enter MngWorkItem,Queue packet num is %d\n",pDevice->rxManeQueue.packet_num); - //printk("Enter MlmeThread,packet _num is %d\n",pDevice->rxManeQueue.packet_num); //i = 0; #if 1 while (1) { - //printk("DDDD\n"); //down(&pDevice->mlme_semaphore); // pRxMgmtPacket = DeQueue(pDevice); #if 1 @@ -1847,20 +1825,15 @@ int MlmeThread( //pDevice; //DequeueManageObject(pDevice->FirstRecvMngList, pDevice->LastRecvMngList); vMgrRxManagePacket(pDevice, pDevice->pMgmt, pRxMgmtPacket); - //printk("packet_num is %d\n",pDevice->rxManeQueue.packet_num); - } spin_unlock_irq(&pDevice->lock); if (mlme_kill == 0) break; //udelay(200); #endif - //printk("Before schedule thread jiffies is %x\n",jiffies); schedule(); - //printk("after schedule thread jiffies is %x\n",jiffies); if (mlme_kill == 0) break; - //printk("i is %d\n",i); } #endif @@ -1885,7 +1858,7 @@ static int device_open(struct net_device *dev) { i = request_irq(pDevice->pcid->irq, &device_intr, IRQF_SHARED, dev->name, dev); if (i) return i; - //printk("DEBUG1\n"); + #ifdef WPA_SM_Transtatus memset(wpa_Result.ifname, 0, sizeof(wpa_Result.ifname)); wpa_Result.proto = 0; @@ -1927,8 +1900,6 @@ static int device_open(struct net_device *dev) { - //printk("thread id is %d\n",pDevice->MLMEThr_pid); - //printk("Create thread time is %x\n",jiffies); //wait_for_completion(&pDevice->notify); @@ -1972,9 +1943,6 @@ static int device_open(struct net_device *dev) { pDevice->eEncryptionStatus = Ndis802_11Encryption1Enabled; } -//printk("DEBUG2\n"); - - DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "call MACvIntEnable\n"); MACvIntEnable(pDevice->PortOffset, IMR_MASK_VALUE); @@ -2579,7 +2547,6 @@ static int device_xmit(struct sk_buff *skb, struct net_device *dev) { } else { - //printk("Auto Rate:Rate is %d,TxPower is %d\n",pDevice->wCurrentRate,pDevice->byCurPwr); } //#endif diff --git a/drivers/staging/vt6655/dpc.c b/drivers/staging/vt6655/dpc.c index f96f9c17e8fe..7719edf0c081 100644 --- a/drivers/staging/vt6655/dpc.c +++ b/drivers/staging/vt6655/dpc.c @@ -297,7 +297,7 @@ void MngWorkItem(void *Context) { PSRxMgmtPacket pRxMgmtPacket; PSDevice pDevice = (PSDevice) Context; - //printk("Enter MngWorkItem,Queue packet num is %d\n",pDevice->rxManeQueue.packet_num); + spin_lock_irq(&pDevice->lock); while (pDevice->rxManeQueue.packet_num != 0) { @@ -320,9 +320,6 @@ device_receive_frame( { PDEVICE_RD_INFO pRDInfo = pCurrRD->pRDInfo; -#ifdef PLICE_DEBUG - //printk("device_receive_frame:pCurrRD is %x,pRDInfo is %x\n",pCurrRD,pCurrRD->pRDInfo); -#endif struct net_device_stats *pStats = &pDevice->stats; struct sk_buff *skb; PSMgmtObject pMgmt = pDevice->pMgmt; @@ -600,7 +597,6 @@ device_receive_frame( #ifdef THREAD EnQueue(pDevice, pRxPacket); - //printk("enque time is %x\n",jiffies); //up(&pDevice->mlme_semaphore); //Enque (pDevice->FirstRecvMngList,pDevice->LastRecvMngList,pMgmt); #else @@ -609,7 +605,6 @@ device_receive_frame( EnQueue(pDevice, pRxPacket); tasklet_schedule(&pDevice->RxMngWorkItem); #else -//printk("RxMan\n"); vMgrRxManagePacket((void *)pDevice, pDevice->pMgmt, pRxPacket); //tasklet_schedule(&pDevice->RxMngWorkItem); #endif @@ -705,7 +700,6 @@ device_receive_frame( if (pDevice->bDiversityEnable && (FrameSize > 50) && (pDevice->eOPMode == OP_MODE_INFRASTRUCTURE) && (pDevice->bLinkPass == true)) { - //printk("device_receive_frame: RxRate is %d\n",*pbyRxRate); BBvAntennaDiversity(pDevice, s_byGetRateIdx(*pbyRxRate), 0); } @@ -967,13 +961,6 @@ device_receive_frame( } return false; } - -// if (pDevice->bRxMICFail == false) { -// for (ii =0; ii < 100; ii++) -// printk(" %02x", *(skb->data + ii)); -// printk("\n"); -// } - } skb->data += cbHeaderOffset; diff --git a/drivers/staging/vt6655/iwctl.c b/drivers/staging/vt6655/iwctl.c index 5b70209a2adb..c5cb6af9566b 100644 --- a/drivers/staging/vt6655/iwctl.c +++ b/drivers/staging/vt6655/iwctl.c @@ -192,7 +192,6 @@ int iwctl_siwscan(struct net_device *dev, } pMgmt->eScanType = WMAC_SCAN_PASSIVE; - //printk("SIOCSIWSCAN:WLAN_CMD_BSSID_SCAN\n"); bScheduleCommand((void *)pDevice, WLAN_CMD_BSSID_SCAN, NULL); spin_unlock_irq(&pDevice->lock); diff --git a/drivers/staging/vt6655/rf.c b/drivers/staging/vt6655/rf.c index df38abf508fd..3f3b5480e769 100644 --- a/drivers/staging/vt6655/rf.c +++ b/drivers/staging/vt6655/rf.c @@ -988,8 +988,6 @@ bool RFbSetPower( //PLICE_DEBUG-> //byPwr+=5; //PLICE_DEBUG <- - -//printk("Rate <11:byPwr is %d\n",byPwr); break; case RATE_6M: case RATE_9M: @@ -1015,8 +1013,6 @@ bool RFbSetPower( //PLICE_DEBUG-> //byPwr+=5; //PLICE_DEBUG<- - -//printk("Rate <24:byPwr is %d\n",byPwr); break; case RATE_24M: case RATE_36M: @@ -1027,7 +1023,6 @@ bool RFbSetPower( //PLICE_DEBUG-> //byPwr+=5; //PLICE_DEBUG<- -//printk("Rate < 54:byPwr is %d\n",byPwr); break; } diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c index ed33e96d0208..091162d5d43c 100644 --- a/drivers/staging/vt6655/rxtx.c +++ b/drivers/staging/vt6655/rxtx.c @@ -378,9 +378,6 @@ s_uGetTxRsvTime( unsigned int uDataTime, uAckTime; uDataTime = BBuGetFrameTime(pDevice->byPreambleType, byPktType, cbFrameLength, wRate); -#ifdef PLICE_DEBUG - //printk("s_uGetTxRsvTime is %d\n",uDataTime); -#endif if (byPktType == PK_TYPE_11B) {//llb,CCK mode uAckTime = BBuGetFrameTime(pDevice->byPreambleType, byPktType, 14, (unsigned short)pDevice->byTopCCKBasicRate); } else {//11g 2.4G OFDM mode & 11a 5G OFDM mode @@ -2178,8 +2175,6 @@ vGenerateFIFOHeader(PSDevice pDevice, unsigned char byPktType, unsigned char *pb } #ifdef PLICE_DEBUG - //printk("Func:vGenerateFIFOHeader:TxDataRate is %d,TxPower is %d\n",pDevice->wCurrentRate,pDevice->byCurPwr); - //if (pDevice->wCurrentRate <= 3) //{ // RFbRawSetPower(pDevice,36,pDevice->wCurrentRate); @@ -2605,9 +2600,6 @@ CMD_STATUS csMgmt_xmit(PSDevice pDevice, PSTxMgmtPacket pPacket) { } pDevice->apCurrTD[TYPE_TXDMA0] = pFrstTD->next; -#ifdef PLICE_DEBUG - //printk("SCAN:CurrentRate is %d,TxPower is %d\n",wCurrentRate,pTxBufHead->byTxPower); -#endif #ifdef TxInSleep pDevice->nTxDataTimeCout = 0; //2008-8-21 chester for send null packet diff --git a/drivers/staging/vt6655/wcmd.c b/drivers/staging/vt6655/wcmd.c index ec3f1421582c..9001fceee10d 100644 --- a/drivers/staging/vt6655/wcmd.c +++ b/drivers/staging/vt6655/wcmd.c @@ -415,7 +415,6 @@ vCommandTimer( spin_unlock_irq(&pDevice->lock); return; } -//printk("chester-pMgmt->uScanChannel=%d,pDevice->byMaxChannel=%d\n",pMgmt->uScanChannel,pDevice->byMaxChannel); if (pMgmt->uScanChannel == pDevice->byMinChannel) { //pMgmt->eScanType = WMAC_SCAN_ACTIVE; pMgmt->abyScanBSSID[0] = 0xFF; @@ -439,8 +438,6 @@ vCommandTimer( DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "SET SCAN Channel Fail: %d\n", pMgmt->uScanChannel); } CARDbSetBSSID(pMgmt->pAdapter, pMgmt->abyCurrBSSID, OP_MODE_UNKNOWN); -// printk("chester-mxch=%d\n",pDevice->byMaxChannel); - // printk("chester-ch=%d\n",pMgmt->uScanChannel); pMgmt->uScanChannel++; //2008-8-4 by chester if (!is_channel_valid(pMgmt->uScanChannel) && @@ -546,7 +543,6 @@ vCommandTimer( spin_unlock_irq(&pDevice->lock); return; } -//printk("chester-currmode=%d\n",pMgmt->eCurrMode); printk("chester-abyDesireSSID=%s\n", ((PWLAN_IE_SSID)pMgmt->abyDesireSSID)->abySSID); //memcpy(pMgmt->abyAdHocSSID,pMgmt->abyDesireSSID, //((PWLAN_IE_SSID)pMgmt->abyDesireSSID)->len + WLAN_IEHDR_LEN); @@ -710,7 +706,6 @@ vCommandTimer( } #ifdef TxInSleep if (pDevice->IsTxDataTrigger != false) { //TxDataTimer is not triggered at the first time - // printk("Re-initial TxDataTimer****\n"); del_timer(&pDevice->sTimerTxData); init_timer(&pDevice->sTimerTxData); pDevice->sTimerTxData.data = (unsigned long) pDevice; @@ -720,7 +715,6 @@ vCommandTimer( pDevice->nTxDataTimeCout = 0; } else { - // printk("mike:-->First time trigger TimerTxData InSleep\n"); } pDevice->IsTxDataTrigger = true; add_timer(&pDevice->sTimerTxData); @@ -1094,8 +1088,6 @@ BSSvSecondTxData( if (pDevice->nTxDataTimeCout < 4) //don't tx data if timer less than 40s { - // printk("mike:%s-->no data Tx not exceed the desired Time as %d\n",__FUNCTION__, - // (int)pDevice->nTxDataTimeCout); pDevice->sTimerTxData.expires = RUN_AT(10*HZ); //10s callback add_timer(&pDevice->sTimerTxData); return; @@ -1108,8 +1100,6 @@ BSSvSecondTxData( #else if (pDevice->bLinkPass == true) { #endif - - // printk("mike:%s-->InSleep Tx Data Procedure\n",__FUNCTION__); pDevice->fTxDataInSleep = true; PSbSendNullPacket(pDevice); //send null packet pDevice->fTxDataInSleep = false; diff --git a/drivers/staging/vt6655/wmgr.c b/drivers/staging/vt6655/wmgr.c index 2cc3514b5a39..7c2f95002561 100644 --- a/drivers/staging/vt6655/wmgr.c +++ b/drivers/staging/vt6655/wmgr.c @@ -2102,9 +2102,6 @@ s_vMgrRxBeacon( &(pMgmt->sNodeDBTable[0].byTopCCKBasicRate), &(pMgmt->sNodeDBTable[0].byTopOFDMBasicRate) ); -#ifdef PLICE_DEBUG - //printk("RxBeacon:MaxSuppRate is %d\n",pMgmt->sNodeDBTable[0].wMaxSuppRate); -#endif if (bUpdatePhyParameter == true) { CARDbSetPhyParameter(pMgmt->pAdapter, pMgmt->eCurrentPHYMode, diff --git a/drivers/staging/vt6655/wpactl.c b/drivers/staging/vt6655/wpactl.c index eda17051297d..94dd57d9979b 100644 --- a/drivers/staging/vt6655/wpactl.c +++ b/drivers/staging/vt6655/wpactl.c @@ -658,15 +658,6 @@ static int wpa_get_scan(PSDevice pDevice, } kfree(ptempBSS); - - // printk("bubble sort result:\n"); - - //for (ii = 0; ii < MAX_BSS_NUM; ii++) - - // printk("%d [%s]:RSSI=%d\n",ii,((PWLAN_IE_SSID)(pMgmt->sBSSList[ii].abySSID))->abySSID, - - // pMgmt->sBSSList[ii].uRSSI); - #endif //******mike:bubble sort by stronger RSSI*****//