Commit 7e809a9b authored by Jim Lieb's avatar Jim Lieb Committed by Greg Kroah-Hartman
Browse files

Staging: vt6655 textual cleanup in prep for driver merge 



The vt6655 and vt6656 drivers are from a common origin but
have drifted apart with minor textual differences.  There
are two changes:

  s/DEVICE_PRT/DBG_PRT/g

and

  s/byPktTyp/byPktType/g

This significantly reduces the differences between the two file sets
in preparation to merging the common code.  A few whitespace and text bits were
also adjusted.

Signed-off-by: default avatarJim Lieb <lieb@canonical.com>
Cc: Forest Bond <forest@alittletooquiet.net>
Cc: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent d899d403

drivers/staging/vt6655/80211mgr.c

+6 −6
Original line number Diff line number Diff line
@@ -236,7 +236,7 @@ vMgrDecodeBeacon( 
                break;



            default:

                DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Unrecognized EID=%dd in beacon decode.\n", pItem->byElementID);

                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Unrecognized EID=%dd in beacon decode.\n", pItem->byElementID);

                break;



        }
@@ -431,7 +431,7 @@ vMgrDecodeAssocRequest( 
                break;



            default:

                DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Unrecognized EID=%dd in assocreq decode.\n",

                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Unrecognized EID=%dd in assocreq decode.\n",

                        pItem->byElementID);

                break;

        }
@@ -509,7 +509,7 @@ vMgrDecodeAssocResponse( 


    if ((((PBYTE)pItem) < (pFrame->pBuf + pFrame->len)) && (pItem->byElementID == WLAN_EID_EXTSUPP_RATES)) {

        pFrame->pExtSuppRates = (PWLAN_IE_SUPP_RATES)pItem;

        DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "pFrame->pExtSuppRates=[%p].\n", pItem);

        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "pFrame->pExtSuppRates=[%p].\n", pItem);

    }

    else {

        pFrame->pExtSuppRates = NULL;
@@ -610,7 +610,7 @@ vMgrDecodeReassocRequest( 
                    pFrame->pExtSuppRates = (PWLAN_IE_SUPP_RATES)pItem;

                break;

            default:

                DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Unrecognized EID=%dd in reassocreq decode.\n",

                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Unrecognized EID=%dd in reassocreq decode.\n",

                            pItem->byElementID);

                break;

        }
@@ -685,7 +685,7 @@ vMgrDecodeProbeRequest( 
                break;



            default:

                DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Bad EID=%dd in probereq\n", pItem->byElementID);

                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Bad EID=%dd in probereq\n", pItem->byElementID);

                break;

        }
@@ -841,7 +841,7 @@ vMgrDecodeProbeResponse( 
                break;



            default:

                DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Bad EID=%dd in proberesp\n", pItem->byElementID);

                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Bad EID=%dd in proberesp\n", pItem->byElementID);

                break;

        }

drivers/staging/vt6655/IEEE11h.c

+2 −2
Original line number Diff line number Diff line
@@ -271,11 +271,11 @@ IEEE11hbMgrRxAction ( 
                }

                break;

            default:

                DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Unknown Action = %d\n", pAction->byAction);

                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Unknown Action = %d\n", pAction->byAction);

                break;

        }

    } else {

        DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Unknown Category = %d\n", pAction->byCategory);

        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Unknown Category = %d\n", pAction->byCategory);

        pAction->byCategory |= 0x80;



       //return (CARDbSendPacket(pMgmt->pAdapter, pAction, PKT_TYPE_802_11_MNG, uLength));

drivers/staging/vt6655/baseband.c

+13 −13
Original line number Diff line number Diff line
@@ -2050,7 +2050,7 @@ BOOL BBbReadEmbeded (DWORD_PTR dwIoBase, BYTE byBBAddr, PBYTE pbyData) 


    if (ww == W_MAX_TIMEOUT) {

        DBG_PORT80(0x30);

        DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO" DBG_PORT80(0x30)\n");

        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" DBG_PORT80(0x30)\n");

        return FALSE;

    }

    return TRUE;
@@ -2092,7 +2092,7 @@ BOOL BBbWriteEmbeded (DWORD_PTR dwIoBase, BYTE byBBAddr, BYTE byData) 


    if (ww == W_MAX_TIMEOUT) {

        DBG_PORT80(0x31);

        DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO" DBG_PORT80(0x31)\n");

        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" DBG_PORT80(0x31)\n");

        return FALSE;

    }

    return TRUE;
@@ -2807,24 +2807,24 @@ BBvAntennaDiversity (PSDevice pDevice, BYTE byRxRate, BYTE bySQ3) 
        return;

    }

    pDevice->uDiversityCnt++;

   // DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "pDevice->uDiversityCnt = %d\n", (int)pDevice->uDiversityCnt);

   // DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "pDevice->uDiversityCnt = %d\n", (int)pDevice->uDiversityCnt);



    pDevice->uNumSQ3[byRxRate]++;



    if (pDevice->byAntennaState == 0) {



        if (pDevice->uDiversityCnt > pDevice->ulDiversityNValue) {

            DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"ulDiversityNValue=[%d],54M-[%d]\n",

            DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"ulDiversityNValue=[%d],54M-[%d]\n",

                          (int)pDevice->ulDiversityNValue, (int)pDevice->uNumSQ3[(int)pDevice->wAntDiversityMaxRate]);



            if (pDevice->uNumSQ3[pDevice->wAntDiversityMaxRate] < pDevice->uDiversityCnt/2) {



                pDevice->ulRatio_State0 = s_ulGetRatio(pDevice);

                DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"SQ3_State0, rate = [%08x]\n", (int)pDevice->ulRatio_State0);

                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"SQ3_State0, rate = [%08x]\n", (int)pDevice->ulRatio_State0);



                if ( pDevice->byTMax == 0 )

                    return;

                DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"1.[%08x], uNumSQ3[%d]=%d, %d\n",

                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
@@ -2852,11 +2852,11 @@ BBvAntennaDiversity (PSDevice pDevice, BYTE byRxRate, BYTE bySQ3) 
            del_timer(&pDevice->TimerSQ3Tmax1);



            pDevice->ulRatio_State1 = s_ulGetRatio(pDevice);

            DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"RX:SQ3_State1, rate0 = %08x,rate1 = %08x\n",

            DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"RX:SQ3_State1, rate0 = %08x,rate1 = %08x\n",

                          (int)pDevice->ulRatio_State0,(int)pDevice->ulRatio_State1);



            if (pDevice->ulRatio_State1 < pDevice->ulRatio_State0) {

                DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"2.[%08x][%08x], uNumSQ3[%d]=%d, %d\n",

                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"2.[%08x][%08x], uNumSQ3[%d]=%d, %d\n",

                              (int)pDevice->ulRatio_State0, (int)pDevice->ulRatio_State1,

                              (int)pDevice->wAntDiversityMaxRate,

                              (int)pDevice->uNumSQ3[(int)pDevice->wAntDiversityMaxRate], (int)pDevice->uDiversityCnt);
@@ -2896,12 +2896,12 @@ TimerSQ3CallBack ( 
{

    PSDevice        pDevice = (PSDevice)hDeviceContext;



    DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"TimerSQ3CallBack...");

    DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"TimerSQ3CallBack...");





    spin_lock_irq(&pDevice->lock);



    DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"3.[%08x][%08x], %d\n",(int)pDevice->ulRatio_State0, (int)pDevice->ulRatio_State1, (int)pDevice->uDiversityCnt);

    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
@@ -2946,7 +2946,7 @@ TimerState1CallBack ( 
{

    PSDevice        pDevice = (PSDevice)hDeviceContext;



    DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"TimerState1CallBack...");

    DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"TimerState1CallBack...");



    spin_lock_irq(&pDevice->lock);

    if (pDevice->uDiversityCnt < pDevice->ulDiversityMValue/100) {
@@ -2961,11 +2961,11 @@ TimerState1CallBack ( 
        add_timer(&pDevice->TimerSQ3Tmax2);

    } else {

        pDevice->ulRatio_State1 = s_ulGetRatio(pDevice);

        DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"SQ3_State1, rate0 = %08x,rate1 = %08x\n",

        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"SQ3_State1, rate0 = %08x,rate1 = %08x\n",

                      (int)pDevice->ulRatio_State0,(int)pDevice->ulRatio_State1);



        if ( pDevice->ulRatio_State1 < pDevice->ulRatio_State0 ) {

            DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"2.[%08x][%08x], uNumSQ3[%d]=%d, %d\n",

            DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"2.[%08x][%08x], uNumSQ3[%d]=%d, %d\n",

                          (int)pDevice->ulRatio_State0, (int)pDevice->ulRatio_State1,

                          (int)pDevice->wAntDiversityMaxRate,

                          (int)pDevice->uNumSQ3[(int)pDevice->wAntDiversityMaxRate], (int)pDevice->uDiversityCnt);

drivers/staging/vt6655/bssdb.c

+20 −20
Original line number Diff line number Diff line
@@ -183,7 +183,7 @@ BYTE ZeroBSSID[WLAN_BSSID_LEN]={0x00,0x00,0x00,0x00,0x00,0x00}; 
    UINT            ii = 0;

//    UINT            jj = 0;   //DavidWang

    if (pbyDesireBSSID != NULL) {

        DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"BSSpSearchBSSList BSSID[%02X %02X %02X-%02X %02X %02X]\n",

        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"BSSpSearchBSSList BSSID[%02X %02X %02X-%02X %02X %02X]\n",

                            *pbyDesireBSSID,*(pbyDesireBSSID+1),*(pbyDesireBSSID+2),

                            *(pbyDesireBSSID+3),*(pbyDesireBSSID+4),*(pbyDesireBSSID+5));

        if ((!IS_BROADCAST_ADDRESS(pbyDesireBSSID)) &&
@@ -252,7 +252,7 @@ if(pDevice->bLinkPass==FALSE) pCurrBSS->bSelected = FALSE; 
                    ((pMgmt->eConfigMode == WMAC_CONFIG_ESS_STA) && WLAN_GET_CAP_INFO_IBSS(pCurrBSS->wCapInfo))

                    ) {

                    // Type not match skip this BSS

                    DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"BSS type mismatch.... Config[%d] BSS[0x%04x]\n", pMgmt->eConfigMode, pCurrBSS->wCapInfo);

                    DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"BSS type mismatch.... Config[%d] BSS[0x%04x]\n", pMgmt->eConfigMode, pCurrBSS->wCapInfo);

                    continue;

                }
@@ -260,7 +260,7 @@ if(pDevice->bLinkPass==FALSE) pCurrBSS->bSelected = FALSE; 
                    if (((ePhyType == PHY_TYPE_11A) && (PHY_TYPE_11A != pCurrBSS->eNetworkTypeInUse)) ||

                        ((ePhyType != PHY_TYPE_11A) && (PHY_TYPE_11A == pCurrBSS->eNetworkTypeInUse))) {

                        // PhyType not match skip this BSS

                        DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Physical type mismatch.... ePhyType[%d] BSS[%d]\n", ePhyType, pCurrBSS->eNetworkTypeInUse);

                        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Physical type mismatch.... ePhyType[%d] BSS[%d]\n", ePhyType, pCurrBSS->eNetworkTypeInUse);

                        continue;

                    }

                }
@@ -450,7 +450,7 @@ BSSbInsertToBSSList ( 
    }



    if (ii == MAX_BSS_NUM){

        DEVICE_PRT(MSG_LEVEL_NOTICE, KERN_INFO "Get free KnowBSS node failed.\n");

        DBG_PRT(MSG_LEVEL_NOTICE, KERN_INFO "Get free KnowBSS node failed.\n");

        return FALSE;

    }

    // save the BSS info
@@ -476,7 +476,7 @@ BSSbInsertToBSSList ( 
        if (pExtSuppRates->len > WLAN_RATES_MAXLEN)

            pExtSuppRates->len = WLAN_RATES_MAXLEN;

        memcpy(pBSSList->abyExtSuppRates, pExtSuppRates, pExtSuppRates->len + WLAN_IEHDR_LEN);

        DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"BSSbInsertToBSSList: pExtSuppRates->len = %d\n", pExtSuppRates->len);

        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"BSSbInsertToBSSList: pExtSuppRates->len = %d\n", pExtSuppRates->len);



    } else {

        memset(pBSSList->abyExtSuppRates, 0, WLAN_IEHDR_LEN + WLAN_RATES_MAXLEN + 1);
@@ -669,7 +669,7 @@ BSSbUpdateToBSSList ( 
    pBSSList->wCapInfo = cpu_to_le16(wCapInfo);

    pBSSList->uClearCount = 0;

    pBSSList->uChannel = byCurrChannel;

//    DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"BSSbUpdateToBSSList: pBSSList->uChannel: %d\n", pBSSList->uChannel);

//    DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"BSSbUpdateToBSSList: pBSSList->uChannel: %d\n", pBSSList->uChannel);



    if (pSSID->len > WLAN_SSID_MAXLEN)

        pSSID->len = WLAN_SSID_MAXLEN;
@@ -872,7 +872,7 @@ BSSvCreateOneNode( 
    // if not found replace uInActiveCount is largest one.

    if ( ii == (MAX_NODE_NUM + 1)) {

        *puNodeIndex = SelectIndex;

        DEVICE_PRT(MSG_LEVEL_NOTICE, KERN_INFO "Replace inactive node = %d\n", SelectIndex);

        DBG_PRT(MSG_LEVEL_NOTICE, KERN_INFO "Replace inactive node = %d\n", SelectIndex);

        // clear ps buffer

        if (pMgmt->sNodeDBTable[*puNodeIndex].sTxPSQueue.next != NULL) {

      	    while ((skb = skb_dequeue(&pMgmt->sNodeDBTable[*puNodeIndex].sTxPSQueue)) != NULL)
@@ -890,7 +890,7 @@ BSSvCreateOneNode( 
    skb_queue_head_init(&pMgmt->sNodeDBTable[*puNodeIndex].sTxPSQueue);

    pMgmt->sNodeDBTable[*puNodeIndex].byAuthSequence = 0;

    pMgmt->sNodeDBTable[*puNodeIndex].wEnQueueCnt = 0;

    DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Create node index = %d\n", ii);

    DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Create node index = %d\n", ii);

    return;

};
@@ -982,7 +982,7 @@ BSSvUpdateAPNode( 
#endif

    // Auto rate fallback function initiation.

    // RATEbInit(pDevice);

    DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pMgmt->sNodeDBTable[0].wTxDataRate = %d \n", pMgmt->sNodeDBTable[0].wTxDataRate);

    DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pMgmt->sNodeDBTable[0].wTxDataRate = %d \n", pMgmt->sNodeDBTable[0].wTxDataRate);



};
@@ -1168,7 +1168,7 @@ CARDbRadioPowerOn(pDevice); 
            if (ii > 0) {

                if (pMgmt->sNodeDBTable[ii].uInActiveCount > MAX_INACTIVE_COUNT) {

                    BSSvRemoveOneNode(pDevice, ii);

                    DEVICE_PRT(MSG_LEVEL_NOTICE, KERN_INFO

                    DBG_PRT(MSG_LEVEL_NOTICE, KERN_INFO

                        "Inactive timeout [%d] sec, STA index = [%d] remove\n", MAX_INACTIVE_COUNT, ii);

                    continue;

                }
@@ -1227,11 +1227,11 @@ CARDbRadioPowerOn(pDevice); 


            // check if pending PS queue

            if (pMgmt->sNodeDBTable[ii].wEnQueueCnt != 0) {

                DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Index= %d, Queue = %d pending \n",

                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Index= %d, Queue = %d pending \n",

                           ii, pMgmt->sNodeDBTable[ii].wEnQueueCnt);

                if ((ii >0) && (pMgmt->sNodeDBTable[ii].wEnQueueCnt > 15)) {

                    BSSvRemoveOneNode(pDevice, ii);

                    DEVICE_PRT(MSG_LEVEL_NOTICE, KERN_INFO "Pending many queues PS STA Index = %d remove \n", ii);

                    DBG_PRT(MSG_LEVEL_NOTICE, KERN_INFO "Pending many queues PS STA Index = %d remove \n", ii);

                    continue;

                }

            }
@@ -1305,7 +1305,7 @@ CARDbRadioPowerOn(pDevice); 
        (pMgmt->eCurrMode == WMAC_MODE_ESS_STA)) {



        if (pMgmt->sNodeDBTable[0].bActive) { // Assoc with BSS

           // DEVICE_PRT(MSG_LEVEL_INFO, KERN_INFO "Callback inactive Count = [%d]\n", pMgmt->sNodeDBTable[0].uInActiveCount);

           // DBG_PRT(MSG_LEVEL_INFO, KERN_INFO "Callback inactive Count = [%d]\n", pMgmt->sNodeDBTable[0].uInActiveCount);

            //if (pDevice->bUpdateBBVGA) {

            //  s_vCheckSensitivity((HANDLE) pDevice);

            //}
@@ -1327,7 +1327,7 @@ CARDbRadioPowerOn(pDevice); 
                netif_stop_queue(pDevice->dev);

                pDevice->bLinkPass = FALSE;

                pDevice->bRoaming = TRUE;

                DEVICE_PRT(MSG_LEVEL_NOTICE, KERN_INFO "Lost AP beacon [%d] sec, disconnected !\n", pMgmt->sNodeDBTable[0].uInActiveCount);

                DBG_PRT(MSG_LEVEL_NOTICE, KERN_INFO "Lost AP beacon [%d] sec, disconnected !\n", pMgmt->sNodeDBTable[0].uInActiveCount);

        if ((pDevice->bWPADEVUp) && (pDevice->skb != NULL)) {

             wpahdr = (viawget_wpa_header *)pDevice->skb->data;

             wpahdr->type = VIAWGET_DISASSOC_MSG;
@@ -1368,7 +1368,7 @@ CARDbRadioPowerOn(pDevice); 
		    //mike use old encryption status for wpa reauthen

	      if(pDevice->bWPADEVUp)

	          pDevice->eEncryptionStatus = pDevice->eOldEncryptionStatus;

                DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Roaming ...\n");

                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Roaming ...\n");

                BSSvClearBSSList((HANDLE)pDevice, pDevice->bLinkPass);

	pMgmt->eScanType = WMAC_SCAN_ACTIVE;

                bScheduleCommand((HANDLE) pDevice, WLAN_CMD_BSSID_SCAN, pMgmt->abyDesireSSID);
@@ -1385,7 +1385,7 @@ CARDbRadioPowerOn(pDevice); 
                pDevice->uAutoReConnectTime++;

            }

            else {

                DEVICE_PRT(MSG_LEVEL_NOTICE, KERN_INFO "Adhoc re-scaning ...\n");

                DBG_PRT(MSG_LEVEL_NOTICE, KERN_INFO "Adhoc re-scaning ...\n");

	pMgmt->eScanType = WMAC_SCAN_ACTIVE;

                bScheduleCommand((HANDLE) pDevice, WLAN_CMD_BSSID_SCAN, NULL);

                bScheduleCommand((HANDLE) pDevice, WLAN_CMD_SSID, NULL);
@@ -1398,7 +1398,7 @@ CARDbRadioPowerOn(pDevice); 
               s_vCheckPreEDThreshold((HANDLE)pDevice);

            }

        	if (pMgmt->sNodeDBTable[0].uInActiveCount >=ADHOC_LOST_BEACON_COUNT) {

        	    DEVICE_PRT(MSG_LEVEL_NOTICE, KERN_INFO "Lost other STA beacon [%d] sec, started !\n", pMgmt->sNodeDBTable[0].uInActiveCount);

        	    DBG_PRT(MSG_LEVEL_NOTICE, KERN_INFO "Lost other STA beacon [%d] sec, started !\n", pMgmt->sNodeDBTable[0].uInActiveCount);

                pMgmt->sNodeDBTable[0].uInActiveCount = 0;

                pMgmt->eCurrState = WMAC_STATE_STARTED;

                netif_stop_queue(pDevice->dev);
@@ -1474,7 +1474,7 @@ BSSvUpdateNodeTxCounter( 
////#endif

    // Only Unicast using support rates

    if (pTxBufHead->wFIFOCtl & FIFOCTL_NEEDACK) {

        DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"wRate %04X, byTsr0 %02X, byTsr1 %02X\n", wRate, byTsr0, byTsr1);

        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"wRate %04X, byTsr0 %02X, byTsr1 %02X\n", wRate, byTsr0, byTsr1);

        if (pMgmt->eCurrMode == WMAC_MODE_ESS_STA) {

            pMgmt->sNodeDBTable[0].uTxAttempts += 1;

            if ((byTsr1 & TSR1_TERR) == 0) {
@@ -1641,7 +1641,7 @@ BSSvClearNodeDBTable( 
            // check if sTxPSQueue has been initial

            if (pMgmt->sNodeDBTable[ii].sTxPSQueue.next != NULL) {

                while ((skb = skb_dequeue(&pMgmt->sNodeDBTable[ii].sTxPSQueue)) != NULL){

                        DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "PS skb != NULL %d\n", ii);

                        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "PS skb != NULL %d\n", ii);

                        dev_kfree_skb(skb);

                }

            }
@@ -1683,7 +1683,7 @@ VOID s_vCheckSensitivity( 
            if (uNumofdBm > 0) {

                LocalldBmAverage = LocalldBmAverage/uNumofdBm;

                for (ii=0;ii<BB_VGA_LEVEL;ii++) {

                    DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"LocalldBmAverage:%ld, %ld %02x\n", LocalldBmAverage, pDevice->ldBmThreshold[ii], pDevice->abyBBVGA[ii]);

                    DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"LocalldBmAverage:%ld, %ld %02x\n", LocalldBmAverage, pDevice->ldBmThreshold[ii], pDevice->abyBBVGA[ii]);

                    if (LocalldBmAverage < pDevice->ldBmThreshold[ii]) {

                	    pDevice->byBBVGANew = pDevice->abyBBVGA[ii];

                        break;

drivers/staging/vt6655/card.c

+16 −16
Original line number Diff line number Diff line
@@ -837,7 +837,7 @@ BOOL CARDbSetChannel (PVOID pDeviceHandler, UINT uConnectionChannel) 
        RFvWriteWakeProgSyn(pDevice->PortOffset, pDevice->byRFType, uConnectionChannel);





    //DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"CARDbSetMediaChannel: %d\n", (BYTE)uConnectionChannel);

    //DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"CARDbSetMediaChannel: %d\n", (BYTE)uConnectionChannel);

    BBvSoftwareReset(pDevice->PortOffset);



    if (pDevice->byLocalID > REV_ID_VT3253_B1) {
@@ -1347,14 +1347,14 @@ BOOL CARDbSetBSSID(PVOID pDeviceHandler, PBYTE pbyBSSID, CARD_OP_MODE eOPMode) 
        MACvRegBitsOff(pDevice->PortOffset, MAC_REG_RCR, RCR_BSSID);

        pDevice->bBSSIDFilter = FALSE;

        pDevice->byRxMode &= ~RCR_BSSID;

        DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "wcmd: rx_mode = %x\n", pDevice->byRxMode );

        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "wcmd: rx_mode = %x\n", pDevice->byRxMode );

    } else {

        if (IS_NULL_ADDRESS(pDevice->abyBSSID) == FALSE) {

            MACvRegBitsOn(pDevice->PortOffset, MAC_REG_RCR, RCR_BSSID);

            pDevice->bBSSIDFilter = TRUE;

            pDevice->byRxMode |= RCR_BSSID;

	    }

	    DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "wmgr: rx_mode = %x\n", pDevice->byRxMode );

	    DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "wmgr: rx_mode = %x\n", pDevice->byRxMode );

    }

    // Adopt BSS state in Adapter Device Object

    pDevice->eOPMode = eOPMode;
@@ -1444,7 +1444,7 @@ CARDbPowerDown( 
    }



    MACvRegBitsOn(pDevice->PortOffset, MAC_REG_PSCTL, PSCTL_GO2DOZE);

    DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Go to Doze ZZZZZZZZZZZZZZZ\n");

    DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Go to Doze ZZZZZZZZZZZZZZZ\n");

    return TRUE;

}
@@ -1590,17 +1590,17 @@ CARDbAdd_PMKID_Candidate ( 
    PPMKID_CANDIDATE    pCandidateList;

    UINT                ii = 0;



    DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"bAdd_PMKID_Candidate START: (%d)\n", (int)pDevice->gsPMKIDCandidate.NumCandidates);

    DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"bAdd_PMKID_Candidate START: (%d)\n", (int)pDevice->gsPMKIDCandidate.NumCandidates);



    if (pDevice->gsPMKIDCandidate.NumCandidates >= MAX_PMKIDLIST) {

        DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"vFlush_PMKID_Candidate: 3\n");

        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"vFlush_PMKID_Candidate: 3\n");

        ZERO_MEMORY(&pDevice->gsPMKIDCandidate, sizeof(SPMKIDCandidateEvent));

    }



    for (ii = 0; ii < 6; ii++) {

        DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"%02X ", *(pbyBSSID + ii));

        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"%02X ", *(pbyBSSID + ii));

    }

    DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"\n");

    DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"\n");





    // Update Old Candidate
@@ -1625,7 +1625,7 @@ CARDbAdd_PMKID_Candidate ( 
    }

    MEMvCopy(pCandidateList->BSSID, pbyBSSID, U_ETHER_ADDR_LEN);

    pDevice->gsPMKIDCandidate.NumCandidates++;

    DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"NumCandidates:%d\n", (int)pDevice->gsPMKIDCandidate.NumCandidates);

    DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"NumCandidates:%d\n", (int)pDevice->gsPMKIDCandidate.NumCandidates);

    return TRUE;

}
@@ -1709,7 +1709,7 @@ VOID CARDvInitChannelTable (PVOID pDeviceHandler) 
            }

        }

    }

 DEVICE_PRT(MSG_LEVEL_NOTICE, KERN_INFO"Zone=[%d][%c][%c]!!\n",pDevice->byZoneType,ChannelRuleTab[pDevice->byZoneType].chCountryCode[0],ChannelRuleTab[pDevice->byZoneType].chCountryCode[1]);

 DBG_PRT(MSG_LEVEL_NOTICE, KERN_INFO"Zone=[%d][%c][%c]!!\n",pDevice->byZoneType,ChannelRuleTab[pDevice->byZoneType].chCountryCode[0],ChannelRuleTab[pDevice->byZoneType].chCountryCode[1]);

    for(ii=0;ii<CARD_MAX_CHANNEL_TBL;ii++) {

        if (pDevice->abyRegPwr[ii+1] == 0) {

            pDevice->abyRegPwr[ii+1] = pDevice->abyOFDMDefaultPwr[ii+1];
@@ -2599,22 +2599,22 @@ WORD CARDwGetOFDMControlRate (PVOID pDeviceHandler, WORD wRateIdx) 
    PSDevice pDevice = (PSDevice) pDeviceHandler;

    UINT ui = (UINT)wRateIdx;



    DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"BASIC RATE: %X\n", pDevice->wBasicRate);

    DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"BASIC RATE: %X\n", pDevice->wBasicRate);



    if (!CARDbIsOFDMinBasicRate((PVOID)pDevice)) {

        DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"CARDwGetOFDMControlRate:(NO OFDM) %d\n", wRateIdx);

        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"CARDwGetOFDMControlRate:(NO OFDM) %d\n", wRateIdx);

        if (wRateIdx > RATE_24M)

            wRateIdx = RATE_24M;

        return wRateIdx;

    }

    while (ui > RATE_11M) {

        if (pDevice->wBasicRate & ((WORD)1 << ui)) {

            DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"CARDwGetOFDMControlRate : %d\n", ui);

            DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"CARDwGetOFDMControlRate : %d\n", ui);

            return (WORD)ui;

        }

        ui --;

    }

    DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"CARDwGetOFDMControlRate: 6M\n");

    DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"CARDwGetOFDMControlRate: 6M\n");

    return (WORD)RATE_24M;

}
@@ -3085,7 +3085,7 @@ void CARDvSetFirstNextTBTT (DWORD_PTR dwIoBase, WORD wBeaconInterval) 
    VNSvOutPortD(dwIoBase + MAC_REG_NEXTTBTT, LODWORD(qwNextTBTT));

    VNSvOutPortD(dwIoBase + MAC_REG_NEXTTBTT + 4, HIDWORD(qwNextTBTT));

    MACvRegBitsOn(dwIoBase, MAC_REG_TFTCTL, TFTCTL_TBTTSYNCEN);

    //DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Card:First Next TBTT[%8xh:%8xh] \n", HIDWORD(qwNextTBTT), LODWORD(qwNextTBTT));

    //DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Card:First Next TBTT[%8xh:%8xh] \n", HIDWORD(qwNextTBTT), LODWORD(qwNextTBTT));

    return;

}
@@ -3113,7 +3113,7 @@ void CARDvUpdateNextTBTT (DWORD_PTR dwIoBase, QWORD qwTSF, WORD wBeaconInterval) 
    VNSvOutPortD(dwIoBase + MAC_REG_NEXTTBTT, LODWORD(qwTSF));

    VNSvOutPortD(dwIoBase + MAC_REG_NEXTTBTT + 4, HIDWORD(qwTSF));

    MACvRegBitsOn(dwIoBase, MAC_REG_TFTCTL, TFTCTL_TBTTSYNCEN);

    DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Card:Update Next TBTT[%8xh:%8xh] \n",(UINT)HIDWORD(qwTSF), (UINT)LODWORD(qwTSF));

    DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Card:Update Next TBTT[%8xh:%8xh] \n",(UINT)HIDWORD(qwTSF), (UINT)LODWORD(qwTSF));



    return;

}