]> git.karo-electronics.de Git - karo-tx-linux.git/blobdiff - drivers/staging/vt6655/wcmd.c
Merge tag 'arm64-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas...
[karo-tx-linux.git] / drivers / staging / vt6655 / wcmd.c
index ec3f1421582cb12ff8d28507486efd6b8bc62fc1..d551653537b4a305c4045b65feadd5714ad84237 100644 (file)
@@ -56,9 +56,6 @@
 
 /*---------------------  Static Definitions -------------------------*/
 
-
-
-
 /*---------------------  Static Classes  ----------------------------*/
 
 /*---------------------  Static Variables  --------------------------*/
@@ -72,7 +69,6 @@ s_vProbeChannel(
        PSDevice pDevice
 );
 
-
 static
 PSTxMgmtPacket
 s_MgrMakeProbeRequest(
@@ -84,7 +80,6 @@ s_MgrMakeProbeRequest(
        PWLAN_IE_SUPP_RATES pCurrExtSuppRates
 );
 
-
 static
 bool
 s_bCommandComplete(
@@ -93,11 +88,8 @@ s_bCommandComplete(
 
 /*---------------------  Export Variables  --------------------------*/
 
-
 /*---------------------  Export Functions  --------------------------*/
 
-
-
 /*
  * Description:
  *      Stop AdHoc beacon during scan process
@@ -115,7 +107,6 @@ static
 void
 vAdHocBeaconStop(PSDevice  pDevice)
 {
-
        PSMgmtObject    pMgmt = &(pDevice->sMgmtObj);
        bool bStop;
 
@@ -132,27 +123,21 @@ vAdHocBeaconStop(PSDevice  pDevice)
         */
        bStop = false;
        if ((pMgmt->eCurrMode == WMAC_MODE_IBSS_STA) &&
-           (pMgmt->eCurrState >= WMAC_STATE_STARTED))
-       {
+           (pMgmt->eCurrState >= WMAC_STATE_STARTED)) {
                if ((pMgmt->uIBSSChannel <=  CB_MAX_CHANNEL_24G) &&
-                   (pMgmt->uScanChannel > CB_MAX_CHANNEL_24G))
-               {
+                   (pMgmt->uScanChannel > CB_MAX_CHANNEL_24G)) {
                        bStop = true;
                }
-               if (pMgmt->uIBSSChannel >  CB_MAX_CHANNEL_24G)
-               {
+               if (pMgmt->uIBSSChannel >  CB_MAX_CHANNEL_24G) {
                        bStop = true;
                }
        }
 
-       if (bStop)
-       {
+       if (bStop) {
                MACvRegBitsOff(pDevice->PortOffset, MAC_REG_TCR, TCR_AUTOBCNTX);
        }
-
 } /* vAdHocBeaconStop */
 
-
 /*
  * Description:
  *      Restart AdHoc beacon after scan process complete
@@ -179,18 +164,11 @@ vAdHocBeaconRestart(PSDevice pDevice)
         *  (2) VT3253 is programmed as automatic Beacon Transmitting
         */
        if ((pMgmt->eCurrMode == WMAC_MODE_IBSS_STA) &&
-           (pMgmt->eCurrState >= WMAC_STATE_STARTED))
-       {
+           (pMgmt->eCurrState >= WMAC_STATE_STARTED)) {
                MACvRegBitsOn(pDevice->PortOffset, MAC_REG_TCR, TCR_AUTOBCNTX);
        }
-
 }
 
-
-
-
-
-
 /*+
  *
  * Routine Description:
@@ -219,7 +197,6 @@ s_vProbeChannel(
        PSMgmtObject    pMgmt = pDevice->pMgmt;
        unsigned int ii;
 
-
        if (pDevice->eCurrentPHYType == PHY_TYPE_11A) {
                pbyRate = &abyCurrSuppRatesA[0];
        } else if (pDevice->eCurrentPHYType == PHY_TYPE_11B) {
@@ -242,18 +219,13 @@ s_vProbeChannel(
                for (ii = 0; ii < 2; ii++) {
                        if (csMgmt_xmit(pDevice, pTxPacket) != CMD_STATUS_PENDING) {
                                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Probe request sending fail.. \n");
-                       }
-                       else {
+                       } else {
                                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Probe request is sending.. \n");
                        }
                }
        }
-
 }
 
-
-
-
 /*+
  *
  * Routine Description:
@@ -265,7 +237,6 @@ s_vProbeChannel(
  *
  -*/
 
-
 PSTxMgmtPacket
 s_MgrMakeProbeRequest(
        PSDevice pDevice,
@@ -280,7 +251,6 @@ s_MgrMakeProbeRequest(
        PSTxMgmtPacket      pTxPacket = NULL;
        WLAN_FR_PROBEREQ    sFrame;
 
-
        pTxPacket = (PSTxMgmtPacket)pMgmt->pbyMgmtPacketPool;
        memset(pTxPacket, 0, sizeof(STxMgmtPacket) + WLAN_PROBEREQ_FR_MAXLEN);
        pTxPacket->p80211Header = (PUWLAN_80211HDR)((unsigned char *)pTxPacket + sizeof(STxMgmtPacket));
@@ -314,10 +284,6 @@ s_MgrMakeProbeRequest(
        return pTxPacket;
 }
 
-
-
-
-
 void
 vCommandTimerWait(
        void *hDeviceContext,
@@ -335,9 +301,6 @@ vCommandTimerWait(
        return;
 }
 
-
-
-
 void
 vCommandTimer(
        void *hDeviceContext
@@ -352,7 +315,6 @@ vCommandTimer(
        unsigned char byMask[8] = {1, 2, 4, 8, 0x10, 0x20, 0x40, 0x80};
        struct sk_buff  *skb;
 
-
        if (pDevice->dwDiagRefCount != 0)
                return;
        if (pDevice->bCmdRunning != true)
@@ -361,7 +323,6 @@ vCommandTimer(
        spin_lock_irq(&pDevice->lock);
 
        switch (pDevice->eCommandState) {
-
        case WLAN_CMD_SCAN_START:
 
                pDevice->byReAssocCount = 0;
@@ -415,7 +376,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 +399,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 <modify> by chester
                        if (!is_channel_valid(pMgmt->uScanChannel) &&
@@ -450,7 +408,6 @@ vCommandTimer(
 
                        }
 
-
                        if ((pMgmt->b11hEnable == false) ||
                            (pMgmt->uScanChannel < CB_MAX_CHANNEL_24G)) {
                                s_vProbeChannel(pDevice);
@@ -546,7 +503,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);
@@ -565,7 +521,6 @@ vCommandTimer(
 
                if ((pMgmt->eCurrState == WMAC_STATE_ASSOC) ||
                    ((pMgmt->eCurrMode == WMAC_MODE_IBSS_STA) && (pMgmt->eCurrState == WMAC_STATE_JOINTED))) {
-
                        if (pItemSSID->len == pItemSSIDCurr->len) {
                                if (memcmp(pItemSSID->abySSID, pItemSSIDCurr->abySSID, pItemSSID->len) == 0) {
                                        s_bCommandComplete(pDevice);
@@ -586,7 +541,6 @@ vCommandTimer(
                vMgrJoinBSSBegin((void *)pDevice, &Status);
                // if Infra mode
                if ((pMgmt->eCurrMode == WMAC_MODE_ESS_STA) && (pMgmt->eCurrState == WMAC_STATE_JOINTED)) {
-
                        // Call mgr to begin the deauthentication
                        // reason = (3) because sta has left ESS
                        if (pMgmt->eCurrState >= WMAC_STATE_AUTH) {
@@ -614,8 +568,7 @@ vCommandTimer(
                                pMgmt->sNodeDBTable[0].bActive = true;
                                pMgmt->sNodeDBTable[0].uInActiveCount = 0;
                                bClearBSSID_SCAN(pDevice);
-                       }
-                       else {
+                       } else {
                                // start own IBSS
                                vMgrCreateOwnIBSS((void *)pDevice, &Status);
                                if (Status != CMD_STATUS_SUCCESS) {
@@ -638,11 +591,9 @@ vCommandTimer(
                                        netif_wake_queue(pDevice->dev);
                                }
                                pDevice->bLinkPass = true;
-                       }
-                       else {
+                       } else {
                                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Disconnect SSID none\n");
 #ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT
-                               // if (pDevice->bWPASuppWextEnabled == true)
                                {
                                        union iwreq_data  wrqu;
                                        memset(&wrqu, 0, sizeof(wrqu));
@@ -676,8 +627,7 @@ vCommandTimer(
 
                else if (pMgmt->eCurrState < WMAC_STATE_AUTHPENDING) {
                        printk("WLAN_AUTHENTICATE_WAIT:Authen Fail???\n");
-               }
-               else  if (pDevice->byLinkWaitCount <= 4) {    //mike add:wait another 2 sec if authenticated_frame delay!
+               } else if (pDevice->byLinkWaitCount <= 4) {    //mike add:wait another 2 sec if authenticated_frame delay!
                        pDevice->byLinkWaitCount++;
                        printk("WLAN_AUTHENTICATE_WAIT:wait %d times!!\n", pDevice->byLinkWaitCount);
                        spin_unlock_irq(&pDevice->lock);
@@ -710,7 +660,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;
@@ -718,18 +667,14 @@ vCommandTimer(
                                pDevice->sTimerTxData.expires = RUN_AT(10*HZ);      //10s callback
                                pDevice->fTxDataInSleep = false;
                                pDevice->nTxDataTimeCout = 0;
-                       }
-                       else {
-                               // printk("mike:-->First time trigger TimerTxData InSleep\n");
+                       } else {
                        }
                        pDevice->IsTxDataTrigger = true;
                        add_timer(&pDevice->sTimerTxData);
 #endif
-               }
-               else if (pMgmt->eCurrState < WMAC_STATE_ASSOCPENDING) {
+               } else if (pMgmt->eCurrState < WMAC_STATE_ASSOCPENDING) {
                        printk("WLAN_ASSOCIATE_WAIT:Association Fail???\n");
-               }
-               else  if (pDevice->byLinkWaitCount <= 4) {    //mike add:wait another 2 sec if associated_frame delay!
+               } else if (pDevice->byLinkWaitCount <= 4) {    //mike add:wait another 2 sec if associated_frame delay!
                        pDevice->byLinkWaitCount++;
                        printk("WLAN_ASSOCIATE_WAIT:wait %d times!!\n", pDevice->byLinkWaitCount);
                        spin_unlock_irq(&pDevice->lock);
@@ -782,8 +727,7 @@ vCommandTimer(
                                if (skb_queue_empty(&pMgmt->sNodeDBTable[0].sTxPSQueue)) {
                                        pMgmt->abyPSTxMap[0] &= ~byMask[0];
                                        pDevice->bMoreData = false;
-                               }
-                               else {
+                               } else {
                                        pDevice->bMoreData = true;
                                }
                                if (!device_dma0_xmit(pDevice, skb, 0)) {
@@ -805,8 +749,7 @@ vCommandTimer(
                                                pMgmt->abyPSTxMap[pMgmt->sNodeDBTable[ii].wAID >> 3] &=
                                                        ~byMask[pMgmt->sNodeDBTable[ii].wAID & 7];
                                                pDevice->bMoreData = false;
-                                       }
-                                       else {
+                                       } else {
                                                pDevice->bMoreData = true;
                                        }
                                        if (!device_dma0_xmit(pDevice, skb, ii)) {
@@ -831,7 +774,6 @@ vCommandTimer(
                s_bCommandComplete(pDevice);
                break;
 
-
        case WLAN_CMD_RADIO_START:
                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "eCommandState == WLAN_CMD_RADIO_START\n");
                if (pDevice->bRadioCmd == true)
@@ -842,7 +784,6 @@ vCommandTimer(
                s_bCommandComplete(pDevice);
                break;
 
-
        case WLAN_CMD_CHECK_BBSENSITIVITY_CHANGE:
                //DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "eCommandState == WLAN_CMD_CHECK_BBSENSITIVITY_START\n");
                // wait all TD complete
@@ -869,10 +810,8 @@ vCommandTimer(
        } //switch
        spin_unlock_irq(&pDevice->lock);
        return;
-
 }
 
-
 static
 bool
 s_bCommandComplete(
@@ -885,14 +824,12 @@ s_bCommandComplete(
        bool bForceSCAN = true;
        PSMgmtObject  pMgmt = pDevice->pMgmt;
 
-
        pDevice->eCommandState = WLAN_CMD_IDLE;
        if (pDevice->cbFreeCmdQueue == CMD_Q_SIZE) {
                //Command Queue Empty
                pDevice->bCmdRunning = false;
                return true;
-       }
-       else {
+       } else {
                pDevice->eCommand = pDevice->eCmdQueue[pDevice->uCmdDequeueIdx].eCmd;
                pSSID = (PWLAN_IE_SSID)pDevice->eCmdQueue[pDevice->uCmdDequeueIdx].abyCmdDesireSSID;
                bRadioCmd = pDevice->eCmdQueue[pDevice->uCmdDequeueIdx].bRadioCmd;
@@ -955,8 +892,6 @@ s_bCommandComplete(
        return true;
 }
 
-
-
 bool bScheduleCommand(
        void *hDeviceContext,
        CMD_CODE    eCommand,
@@ -965,9 +900,8 @@ bool bScheduleCommand(
 {
        PSDevice        pDevice = (PSDevice)hDeviceContext;
 
-
        if (pDevice->cbFreeCmdQueue == 0) {
-               return (false);
+               return false;
        }
        pDevice->eCmdQueue[pDevice->uCmdEnqueueIdx].eCmd = eCommand;
        pDevice->eCmdQueue[pDevice->uCmdEnqueueIdx].bForceSCAN = true;
@@ -975,7 +909,6 @@ bool bScheduleCommand(
 
        if (pbyItem0 != NULL) {
                switch (eCommand) {
-
                case WLAN_CMD_BSSID_SCAN:
                        memcpy(pDevice->eCmdQueue[pDevice->uCmdEnqueueIdx].abyCmdDesireSSID,
                               pbyItem0, WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1);
@@ -1017,11 +950,9 @@ bool bScheduleCommand(
 
        if (pDevice->bCmdRunning == false) {
                s_bCommandComplete(pDevice);
+       } else {
        }
-       else {
-       }
-       return (true);
-
+       return true;
 }
 
 /*
@@ -1081,7 +1012,6 @@ vResetCommandTimer(
        pDevice->bCmdClear = false;
 }
 
-
 #ifdef TxInSleep
 void
 BSSvSecondTxData(
@@ -1094,8 +1024,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 +1036,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;
@@ -1121,4 +1047,3 @@ BSSvSecondTxData(
                return;
        }
 #endif
-