]> git.karo-electronics.de Git - karo-tx-linux.git/blobdiff - drivers/staging/vt6655/wmgr.c
Merge tag 'arm64-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas...
[karo-tx-linux.git] / drivers / staging / vt6655 / wmgr.c
index 87e5088616c1505f950f8f4c5eb6b2c54329c394..9938813f997a276227d1cdaae10fc245e97f886b 100644 (file)
@@ -84,8 +84,6 @@
 
 /*---------------------  Static Definitions -------------------------*/
 
-
-
 /*---------------------  Static Classes  ----------------------------*/
 
 /*---------------------  Static Variables  --------------------------*/
@@ -251,7 +249,6 @@ s_MgrMakeBeacon(
        PWLAN_IE_SUPP_RATES pCurrExtSuppRates
 );
 
-
 // Association response
 static
 PSTxMgmtPacket
@@ -306,7 +303,6 @@ s_vMgrLogStatus(
        unsigned short wStatus
 );
 
-
 static
 void
 s_vMgrSynchBSS(
@@ -316,7 +312,6 @@ s_vMgrSynchBSS(
        PCMD_STATUS  pStatus
 );
 
-
 static bool
 s_bCipherMatch(
        PKnownBSS                        pBSSNode,
@@ -330,14 +325,10 @@ static void  Encyption_Rebuild(
        PKnownBSS pCurr
 );
 
-
-
 /*---------------------  Export Variables  --------------------------*/
 
-
 /*---------------------  Export Functions  --------------------------*/
 
-
 /*+
  *
  * Routine Description:
@@ -357,7 +348,6 @@ vMgrObjectInit(
        PSMgmtObject    pMgmt = pDevice->pMgmt;
        int ii;
 
-
        pMgmt->pbyPSPacketPool = &pMgmt->byPSPacketPool[0];
        pMgmt->pbyMgmtPacketPool = &pMgmt->byMgmtPacketPool[0];
        pMgmt->uCurrChannel = pDevice->uChannel;
@@ -392,7 +382,6 @@ vMgrTimerInit(
        PSDevice     pDevice = (PSDevice)hDeviceContext;
        PSMgmtObject    pMgmt = pDevice->pMgmt;
 
-
        init_timer(&pMgmt->sTimerSecondCallback);
        pMgmt->sTimerSecondCallback.data = (unsigned long) pDevice;
        pMgmt->sTimerSecondCallback.function = (TimerFunction)BSSvSecondCallBack;
@@ -420,8 +409,6 @@ vMgrTimerInit(
        return;
 }
 
-
-
 /*+
  *
  * Routine Description:
@@ -448,7 +435,6 @@ vMgrObjectReset(
        return;
 }
 
-
 /*+
  *
  * Routine Description:
@@ -460,7 +446,6 @@ vMgrObjectReset(
  *
  -*/
 
-
 void
 vMgrAssocBeginSta(
        void *hDeviceContext,
@@ -471,16 +456,11 @@ vMgrAssocBeginSta(
        PSDevice             pDevice = (PSDevice)hDeviceContext;
        PSTxMgmtPacket          pTxPacket;
 
-
        pMgmt->wCurrCapInfo = 0;
        pMgmt->wCurrCapInfo |= WLAN_SET_CAP_INFO_ESS(1);
        if (pDevice->bEncryptionEnable) {
                pMgmt->wCurrCapInfo |= WLAN_SET_CAP_INFO_PRIVACY(1);
        }
-       // always allow receive short preamble
-       //if (pDevice->byPreambleType == 1) {
-       //    pMgmt->wCurrCapInfo |= WLAN_SET_CAP_INFO_SHORTPREAMBLE(1);
-       //}
        pMgmt->wCurrCapInfo |= WLAN_SET_CAP_INFO_SHORTPREAMBLE(1);
        if (pMgmt->wListenInterval == 0)
                pMgmt->wListenInterval = 1;    // at least one.
@@ -525,7 +505,6 @@ vMgrAssocBeginSta(
        return;
 }
 
-
 /*+
  *
  * Routine Description:
@@ -546,23 +525,17 @@ vMgrReAssocBeginSta(
        PSDevice             pDevice = (PSDevice)hDeviceContext;
        PSTxMgmtPacket          pTxPacket;
 
-
-
        pMgmt->wCurrCapInfo = 0;
        pMgmt->wCurrCapInfo |= WLAN_SET_CAP_INFO_ESS(1);
        if (pDevice->bEncryptionEnable) {
                pMgmt->wCurrCapInfo |= WLAN_SET_CAP_INFO_PRIVACY(1);
        }
 
-       //if (pDevice->byPreambleType == 1) {
-       //    pMgmt->wCurrCapInfo |= WLAN_SET_CAP_INFO_SHORTPREAMBLE(1);
-       //}
        pMgmt->wCurrCapInfo |= WLAN_SET_CAP_INFO_SHORTPREAMBLE(1);
 
        if (pMgmt->wListenInterval == 0)
                pMgmt->wListenInterval = 1;    // at least one.
 
-
        // ERP Phy (802.11g) should support short preamble.
        if (pMgmt->eCurrentPHYMode == PHY_TYPE_11G) {
                pMgmt->wCurrCapInfo |= WLAN_SET_CAP_INFO_SHORTPREAMBLE(1);
@@ -577,7 +550,6 @@ vMgrReAssocBeginSta(
        if (pMgmt->b11hEnable == true)
                pMgmt->wCurrCapInfo |= WLAN_SET_CAP_INFO_SPECTRUMMNG(1);
 
-
        pTxPacket = s_MgrMakeReAssocRequest
                (
                        pDevice,
@@ -600,7 +572,6 @@ vMgrReAssocBeginSta(
                }
        }
 
-
        return;
 }
 
@@ -664,8 +635,6 @@ vMgrDisassocBeginSta(
        return;
 }
 
-
-
 /*+
  *
  * Routine Description:(AP function)
@@ -694,7 +663,6 @@ s_vMgrRxAssocRequest(
        unsigned char abyCurrSuppRates[WLAN_IEHDR_LEN + WLAN_RATES_MAXLEN + 1];
        unsigned char abyCurrExtSuppRates[WLAN_IEHDR_LEN + WLAN_RATES_MAXLEN + 1];
 
-
        if (pMgmt->eCurrMode != WMAC_MODE_ESS_AP)
                return;
        //  node index not found
@@ -734,7 +702,6 @@ s_vMgrRxAssocRequest(
                        abyCurrExtSuppRates[1] = 0;
                }
 
-
                RATEvParseMaxRate((void *)pDevice,
                                  (PWLAN_IE_SUPP_RATES)abyCurrSuppRates,
                                  (PWLAN_IE_SUPP_RATES)abyCurrExtSuppRates,
@@ -789,7 +756,6 @@ s_vMgrRxAssocRequest(
                return;
        }
 
-
        // assoc response reply..
        pTxPacket = s_MgrMakeAssocResponse
                (
@@ -803,7 +769,6 @@ s_vMgrRxAssocRequest(
                        (PWLAN_IE_SUPP_RATES)pMgmt->abyCurrExtSuppRates
 );
        if (pTxPacket != NULL) {
-
                if (pDevice->bEnableHostapd) {
                        return;
                }
@@ -820,7 +785,6 @@ s_vMgrRxAssocRequest(
        return;
 }
 
-
 /*+
  *
  * Description:(AP function)
@@ -892,7 +856,6 @@ s_vMgrRxReAssocRequest(
                        abyCurrExtSuppRates[1] = 0;
                }
 
-
                RATEvParseMaxRate((void *)pDevice,
                                  (PWLAN_IE_SUPP_RATES)abyCurrSuppRates,
                                  (PWLAN_IE_SUPP_RATES)abyCurrExtSuppRates,
@@ -946,7 +909,6 @@ s_vMgrRxReAssocRequest(
 
        }
 
-
        // assoc response reply..
        pTxPacket = s_MgrMakeReAssocResponse
                (
@@ -975,7 +937,6 @@ s_vMgrRxReAssocRequest(
        return;
 }
 
-
 /*+
  *
  * Routine Description:
@@ -1000,11 +961,8 @@ s_vMgrRxAssocResponse(
        unsigned char *pbyIEs;
        viawget_wpa_header *wpahdr;
 
-
-
        if (pMgmt->eCurrState == WMAC_STATE_ASSOCPENDING ||
            pMgmt->eCurrState == WMAC_STATE_ASSOC) {
-
                sFrame.len = pRxPacket->cbMPDULen;
                sFrame.pBuf = (unsigned char *)pRxPacket->p80211Header;
                // decode the frame
@@ -1069,7 +1027,6 @@ s_vMgrRxAssocResponse(
 
 //2008-0409-07, <Add> by Einsn Liu
 #ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT
-                       //if (pDevice->bWPADevEnable == true)
                        {
                                unsigned char buf[512];
                                size_t len;
@@ -1098,7 +1055,6 @@ s_vMgrRxAssocResponse(
                                        wireless_send_event(pDevice->dev, we_event, &wrqu, buf);
                                }
 
-
                                memset(&wrqu, 0, sizeof(wrqu));
                                memcpy(wrqu.ap_addr.sa_data, &pMgmt->abyCurrBSSID[0], ETH_ALEN);
                                wrqu.ap_addr.sa_family = ARPHRD_ETHER;
@@ -1125,14 +1081,11 @@ s_vMgrRxAssocResponse(
        pDevice->bWPASuppWextEnabled = false;
 #endif
 
-
        if (pMgmt->eCurrState == WMAC_STATE_ASSOC)
                timer_expire(pDevice->sTimerCommand, 0);
        return;
 }
 
-
-
 /*+
  *
  * Routine Description:
@@ -1189,8 +1142,6 @@ vMgrAuthenBeginSta(
        return;
 }
 
-
-
 /*+
  *
  * Routine Description:
@@ -1215,7 +1166,6 @@ vMgrDeAuthenBeginSta(
        WLAN_FR_DEAUTHEN    sFrame;
        PSTxMgmtPacket      pTxPacket = NULL;
 
-
        pTxPacket = (PSTxMgmtPacket)pMgmt->pbyMgmtPacketPool;
        memset(pTxPacket, 0, sizeof(STxMgmtPacket) + WLAN_DEAUTHEN_FR_MAXLEN);
        pTxPacket->p80211Header = (PUWLAN_80211HDR)((unsigned char *)pTxPacket + sizeof(STxMgmtPacket));
@@ -1243,11 +1193,9 @@ vMgrDeAuthenBeginSta(
                *pStatus = CMD_STATUS_SUCCESS;
        }
 
-
        return;
 }
 
-
 /*+
  *
  * Routine Description:
@@ -1301,8 +1249,6 @@ s_vMgrRxAuthentication(
        return;
 }
 
-
-
 /*+
  *
  * Routine Description:
@@ -1315,7 +1261,6 @@ s_vMgrRxAuthentication(
  *
  -*/
 
-
 static
 void
 s_vMgrRxAuthenSequence_1(
@@ -1378,7 +1323,6 @@ s_vMgrRxAuthenSequence_1(
 
        if (pMgmt->bShareKeyAlgorithm &&
            (cpu_to_le16(*(sFrame.pwStatus)) == WLAN_MGMT_STATUS_SUCCESS)) {
-
                sFrame.pChallenge = (PWLAN_IE_CHALLENGE)(sFrame.pBuf + sFrame.len);
                sFrame.len += WLAN_CHALLENGE_IE_LEN;
                sFrame.pChallenge->byElementID = WLAN_EID_CHALLENGE;
@@ -1406,8 +1350,6 @@ s_vMgrRxAuthenSequence_1(
        return;
 }
 
-
-
 /*+
  *
  * Routine Description:
@@ -1431,7 +1373,6 @@ s_vMgrRxAuthenSequence_2(
        WLAN_FR_AUTHEN      sFrame;
        PSTxMgmtPacket      pTxPacket = NULL;
 
-
        switch (cpu_to_le16((*(pFrame->pwAuthAlgorithm)))) {
        case WLAN_AUTH_ALG_OPENSYSTEM:
                if (cpu_to_le16((*(pFrame->pwStatus))) == WLAN_MGMT_STATUS_SUCCESS) {
@@ -1504,8 +1445,6 @@ s_vMgrRxAuthenSequence_2(
        return;
 }
 
-
-
 /*+
  *
  * Routine Description:
@@ -1591,11 +1530,8 @@ reply:
                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Mgt:Authreq_reply sequence_4 tx failed.\n");
        }
        return;
-
 }
 
-
-
 /*+
  *
  * Routine Description:
@@ -1614,7 +1550,6 @@ s_vMgrRxAuthenSequence_4(
        PWLAN_FR_AUTHEN pFrame
 )
 {
-
        if (cpu_to_le16((*(pFrame->pwStatus))) == WLAN_MGMT_STATUS_SUCCESS) {
                DBG_PRT(MSG_LEVEL_INFO, KERN_INFO "802.11 Authen (SHAREDKEY) Successful.\n");
                pMgmt->eCurrState = WMAC_STATE_AUTH;
@@ -1630,7 +1565,6 @@ s_vMgrRxAuthenSequence_4(
 //        vCommandTimerWait((void *)pDevice, 0);
 //        spin_lock_irq(&pDevice->lock);
        }
-
 }
 
 /*+
@@ -1674,9 +1608,6 @@ s_vMgrRxDisassociation(
                DBG_PRT(MSG_LEVEL_NOTICE, KERN_INFO "AP disassociated me, reason=%d.\n", cpu_to_le16(*(sFrame.pwReason)));
                //TODO: do something let upper layer know or
                //try to send associate packet again because of inactivity timeout
-               //  if (pMgmt->eCurrState == WMAC_STATE_ASSOC) {
-               //     vMgrReAssocBeginSta((PSDevice)pDevice, pMgmt, &CmdStatus);
-               //  }
                if ((pDevice->bWPADEVUp) && (pDevice->skb != NULL)) {
                        wpahdr = (viawget_wpa_header *)pDevice->skb->data;
                        wpahdr->type = VIAWGET_DISASSOC_MSG;
@@ -1694,7 +1625,6 @@ s_vMgrRxDisassociation(
                }
 
 #ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT
-               // if (pDevice->bWPASuppWextEnabled == true)
                {
                        union iwreq_data  wrqu;
                        memset(&wrqu, 0, sizeof(wrqu));
@@ -1709,7 +1639,6 @@ s_vMgrRxDisassociation(
        return;
 }
 
-
 /*+
  *
  * Routine Description:
@@ -1733,7 +1662,6 @@ s_vMgrRxDeauthentication(
        unsigned int uNodeIndex = 0;
        viawget_wpa_header *wpahdr;
 
-
        if (pMgmt->eCurrMode == WMAC_MODE_ESS_AP) {
                //Todo:
                // if is acting an AP..
@@ -1778,7 +1706,6 @@ s_vMgrRxDeauthentication(
                        }
 
 #ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT
-                       // if (pDevice->bWPASuppWextEnabled == true)
                        {
                                union iwreq_data  wrqu;
                                memset(&wrqu, 0, sizeof(wrqu));
@@ -1795,7 +1722,6 @@ s_vMgrRxDeauthentication(
        return;
 }
 
-
 //2008-8-4 <add> by chester
 /*+
  *
@@ -1833,7 +1759,6 @@ ChannelExceedZoneType(
        return exceed;
 }
 
-
 /*+
  *
  * Routine Description:
@@ -1854,7 +1779,6 @@ s_vMgrRxBeacon(
        bool bInScan
 )
 {
-
        PKnownBSS           pBSSList;
        WLAN_FR_BEACON      sFrame;
        QWORD               qwTSFOffset;
@@ -1880,7 +1804,6 @@ s_vMgrRxBeacon(
        bool bUpdatePhyParameter = false;
        unsigned char byIEChannel = 0;
 
-
        memset(&sFrame, 0, sizeof(WLAN_FR_BEACON));
        sFrame.len = pRxPacket->cbMPDULen;
        sFrame.pBuf = (unsigned char *)pRxPacket->p80211Header;
@@ -1896,7 +1819,6 @@ s_vMgrRxBeacon(
                return;
        }
 
-
        if (sFrame.pDSParms != NULL) {
                if (byCurrChannel > CB_MAX_CHANNEL_24G) {
                        // channel remapping to
@@ -1979,7 +1901,6 @@ s_vMgrRxBeacon(
                bIsChannelEqual = true;
 
        if (bIsChannelEqual && (pMgmt->eCurrMode == WMAC_MODE_ESS_AP)) {
-
                // if rx beacon without ERP field
                if (sERP.bERPExist) {
                        if (WLAN_GET_ERP_USE_PROTECTION(sERP.byERP)) {
@@ -2007,7 +1928,6 @@ s_vMgrRxBeacon(
                }
        }
 
-
        if (pMgmt->eCurrMode == WMAC_MODE_ESS_AP)
                return;
 
@@ -2015,7 +1935,6 @@ s_vMgrRxBeacon(
        if (memcmp(sFrame.pHdr->sA3.abyAddr3,
                   pMgmt->abyCurrBSSID,
                   WLAN_BSSID_LEN) == 0) {
-
                bIsBSSIDEqual = true;
 
 // 2008-05-21 <add> by Richardtai
@@ -2047,7 +1966,6 @@ s_vMgrRxBeacon(
                bIsAPBeacon = true;
 
                if (pBSSList != NULL) {
-
                        // Compare PHY parameter setting
                        if (pMgmt->wCurrCapInfo != pBSSList->wCapInfo) {
                                bUpdatePhyParameter = true;
@@ -2147,16 +2065,13 @@ s_vMgrRxBeacon(
                bTSFLargeDiff = true;
        }
 
-
        // if infra mode
        if (bIsAPBeacon == true) {
-
                // Infra mode: Local TSF always follow AP's TSF if Difference huge.
                if (bTSFLargeDiff)
                        bUpdateTSF = true;
 
                if ((pDevice->bEnablePSMode == true) && (sFrame.pTIM != 0)) {
-
                        // deal with DTIM, analysis TIM
                        pMgmt->bMulticastTIM = WLAN_MGMT_IS_MULTICAST_TIM(sFrame.pTIM->byBitMapCtl) ? true : false;
                        pMgmt->byDTIMCount = sFrame.pTIM->byDTIMCount;
@@ -2221,7 +2136,6 @@ s_vMgrRxBeacon(
 
                        // During dpc, already in spinlocked.
                        if (BSSDBbIsSTAInNodeDB(pMgmt, sFrame.pHdr->sA3.abyAddr2, &uNodeIndex)) {
-
                                // Update the STA, (Technically the Beacons of all the IBSS nodes
                                // should be identical, but that's not happening in practice.
                                pMgmt->abyCurrSuppRates[1] = RATEuSetIE((PWLAN_IE_SUPP_RATES)sFrame.pSuppRates,
@@ -2262,7 +2176,6 @@ s_vMgrRxBeacon(
                                pMgmt->sNodeDBTable[uNodeIndex].bShortPreamble = WLAN_GET_CAP_INFO_SHORTPREAMBLE(*sFrame.pwCapInfo);
                                pMgmt->sNodeDBTable[uNodeIndex].wTxDataRate = pMgmt->sNodeDBTable[uNodeIndex].wMaxSuppRate;
 #ifdef PLICE_DEBUG
-                               //if (uNodeIndex == 0)
                                {
                                        printk("s_vMgrRxBeacon:TxDataRate is %d,Index is %d\n", pMgmt->sNodeDBTable[uNodeIndex].wTxDataRate, uNodeIndex);
                                }
@@ -2287,7 +2200,6 @@ s_vMgrRxBeacon(
 
                        }
                } else if (bIsSSIDEqual) {
-
                        // See other adhoc sta with the same SSID but BSSID is different.
                        // adpot this vars only when TSF larger then us.
                        if (bTSFLargeDiff && bTSFOffsetPostive) {
@@ -2317,7 +2229,6 @@ s_vMgrRxBeacon(
                                                     pMgmt->abyCurrSuppRates,
                                                     pMgmt->abyCurrExtSuppRates);
 
-
                                // MACvRegBitsOff(pDevice->PortOffset, MAC_REG_RCR, RCR_BSSID);
                                // set highest basic rate
                                // s_vSetHighestBasicRate(pDevice, (PWLAN_IE_SUPP_RATES)pMgmt->abyCurrSuppRates);
@@ -2339,8 +2250,6 @@ if (bUpdateTSF) {
        return;
 }
 
-
-
 /*+
  *
  * Routine Description:
@@ -2410,7 +2319,6 @@ vMgrCreateOwnIBSS(
                        pMgmt->abyCurrSuppRates[2+ii] = abyRATE[ii];
        }
 
-
        if (pMgmt->eCurrentPHYMode == PHY_TYPE_11G) {
                pMgmt->abyCurrSuppRates[1] = 8;
                pMgmt->abyCurrExtSuppRates[1] = 4;
@@ -2422,7 +2330,6 @@ vMgrCreateOwnIBSS(
                        pMgmt->abyCurrExtSuppRates[2+ii] =  abyOFDM_RATE[ii+4];
        }
 
-
        // Disable Protect Mode
        pDevice->bProtectMode = 0;
        MACvDisableProtectMD(pDevice->PortOffset);
@@ -2436,7 +2343,6 @@ vMgrCreateOwnIBSS(
        if (pMgmt->wIBSSBeaconPeriod == 0)
                pMgmt->wIBSSBeaconPeriod = DEFAULT_IBSS_BI;
 
-
        CARDbGetCurrentTSF(pDevice->PortOffset, &qwCurrTSF);
        // clear TSF counter
        VNSvOutPortB(pDevice->PortOffset + MAC_REG_TFTCTL, TFTCTL_TSFCNTRST);
@@ -2451,7 +2357,6 @@ vMgrCreateOwnIBSS(
        if (pMgmt->uIBSSChannel == 0)
                pMgmt->uIBSSChannel = DEFAULT_IBSS_CHANNEL;
 
-
        // set basic rate
 
        RATEvParseMaxRate((void *)pDevice, (PWLAN_IE_SUPP_RATES)pMgmt->abyCurrSuppRates,
@@ -2459,7 +2364,6 @@ vMgrCreateOwnIBSS(
                          &wMaxBasicRate, &wMaxSuppRate, &wSuppRate,
                          &byTopCCKBasicRate, &byTopOFDMBasicRate);
 
-
        if (pMgmt->eConfigMode == WMAC_CONFIG_AP) {
                pMgmt->eCurrMode = WMAC_MODE_ESS_AP;
        }
@@ -2494,7 +2398,6 @@ vMgrCreateOwnIBSS(
        }
 
        if (pMgmt->eCurrMode == WMAC_MODE_IBSS_STA) {
-
                // BSSID selected must be randomized as spec 11.1.3
                pMgmt->abyCurrBSSID[5] = (unsigned char) (LODWORD(qwCurrTSF) & 0x000000ff);
                pMgmt->abyCurrBSSID[4] = (unsigned char)((LODWORD(qwCurrTSF) & 0x0000ff00) >> 8);
@@ -2511,7 +2414,6 @@ vMgrCreateOwnIBSS(
                pMgmt->abyCurrBSSID[0] &= ~IEEE_ADDR_GROUP;
                pMgmt->abyCurrBSSID[0] |= IEEE_ADDR_UNIVERSAL;
 
-
                DBG_PRT(MSG_LEVEL_INFO, KERN_INFO "Adhoc beacon created bssid:%pM\n",
                        pMgmt->abyCurrBSSID);
        }
@@ -2593,8 +2495,6 @@ vMgrCreateOwnIBSS(
        return;
 }
 
-
-
 /*+
  *
  * Routine Description:
@@ -2614,7 +2514,6 @@ vMgrJoinBSSBegin(
        PCMD_STATUS pStatus
 )
 {
-
        PSDevice     pDevice = (PSDevice)hDeviceContext;
        PSMgmtObject    pMgmt = pDevice->pMgmt;
        PKnownBSS       pCurr = NULL;
@@ -2629,7 +2528,6 @@ vMgrJoinBSSBegin(
        unsigned char byTopCCKBasicRate = RATE_1M;
        unsigned char byTopOFDMBasicRate = RATE_1M;
 
-
        for (ii = 0; ii < MAX_BSS_NUM; ii++) {
                if (pMgmt->sBSSList[ii].bActive == true)
                        break;
@@ -2659,9 +2557,7 @@ vMgrJoinBSSBegin(
 
        DBG_PRT(MSG_LEVEL_NOTICE, KERN_INFO "AP(BSS) finding:Found a AP(BSS)..\n");
        if (WLAN_GET_CAP_INFO_ESS(cpu_to_le16(pCurr->wCapInfo))) {
-
                if ((pMgmt->eAuthenMode == WMAC_AUTH_WPA) || (pMgmt->eAuthenMode == WMAC_AUTH_WPAPSK)) {
-
                        // patch for CISCO migration mode
 /*
   if (pDevice->eEncryptionStatus == Ndis802_11Encryption2Enabled) {
@@ -2683,7 +2579,6 @@ vMgrJoinBSSBegin(
                }
 
 #ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT
-               //if (pDevice->bWPASuppWextEnabled == true)
                Encyption_Rebuild(pDevice, pCurr);
 #endif
                // Infrastructure BSS
@@ -2694,7 +2589,6 @@ vMgrJoinBSSBegin(
 );
 
                if (*pStatus == CMD_STATUS_SUCCESS) {
-
                        // Adopt this BSS state vars in Mgmt Object
                        pMgmt->uCurrChannel = pCurr->uChannel;
 
@@ -2773,18 +2667,14 @@ vMgrJoinBSSBegin(
 
                        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Join ESS\n");
 
-
-
                        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "End of Join AP -- A/B/G Action\n");
                } else {
                        pMgmt->eCurrState = WMAC_STATE_IDLE;
                };
 
-
        } else {
                // ad-hoc mode BSS
                if (pMgmt->eAuthenMode == WMAC_AUTH_WPANONE) {
-
                        if (pDevice->eEncryptionStatus == Ndis802_11Encryption2Enabled) {
                                if (WPA_SearchRSN(0, WPA_TKIP, pCurr) == false) {
                                        // encryption mode error
@@ -2815,7 +2705,6 @@ vMgrJoinBSSBegin(
                        // TODO: check if CapInfo privacy on, but we don't..
                        pMgmt->uCurrChannel = pCurr->uChannel;
 
-
                        // Parse Support Rate IE
                        pMgmt->abyCurrSuppRates[0] = WLAN_EID_SUPP_RATES;
                        pMgmt->abyCurrSuppRates[1] = RATEuSetIE((PWLAN_IE_SUPP_RATES)pCurr->abySuppRates,
@@ -2855,8 +2744,6 @@ vMgrJoinBSSBegin(
        return;
 }
 
-
-
 /*+
  *
  * Routine Description:
@@ -2886,7 +2773,6 @@ s_vMgrSynchBSS(
        unsigned char abyCurrSuppRatesA[] = {WLAN_EID_SUPP_RATES, 8, 0x0C, 0x12, 0x18, 0x24, 0x30, 0x48, 0x60, 0x6C};
        unsigned char abyCurrSuppRatesB[] = {WLAN_EID_SUPP_RATES, 4, 0x02, 0x04, 0x0B, 0x16};
 
-
        *pStatus = CMD_STATUS_FAILURE;
 
        if (s_bCipherMatch(pCurr,
@@ -2971,7 +2857,6 @@ s_vMgrSynchBSS(
                memcpy(pMgmt->abyCurrExtSuppRates, &abyCurrExtSuppRatesG[0], sizeof(abyCurrExtSuppRatesG));
        }
 
-
        if (WLAN_GET_CAP_INFO_ESS(pCurr->wCapInfo)) {
                CARDbSetBSSID(pMgmt->pAdapter, pCurr->abyBSSID, OP_MODE_INFRASTRUCTURE);
                // Add current BSS to Candidate list
@@ -3022,10 +2907,8 @@ s_vMgrSynchBSS(
        pMgmt->byERPContext = pCurr->sERP.byERP;
        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Sync:Set to channel = [%d]\n", (int)pCurr->uChannel);
 
-
        *pStatus = CMD_STATUS_SUCCESS;
 
-
        return;
 };
 
@@ -3037,15 +2920,7 @@ static void  Encyption_Rebuild(
 )
 {
        PSMgmtObject  pMgmt = &(pDevice->sMgmtObj);
-       // unsigned int ii , uSameBssidNum=0;
-
-       //  for (ii = 0; ii < MAX_BSS_NUM; ii++) {
-       //   if (pMgmt->sBSSList[ii].bActive &&
-       //      !compare_ether_addr(pMgmt->sBSSList[ii].abyBSSID, pCurr->abyBSSID)) {
-       //       uSameBssidNum++;
-       //   }
-       // }
-       //   if (uSameBssidNum>=2) {     //we only check AP in hidden sssid  mode
+
        if ((pMgmt->eAuthenMode == WMAC_AUTH_WPAPSK) ||           //networkmanager 0.7.0 does not give the pairwise-key selection,
            (pMgmt->eAuthenMode == WMAC_AUTH_WPA2PSK)) {         // so we need re-select it according to real pairwise-key info.
                if (pCurr->bWPAValid == true)  {   //WPA-PSK
@@ -3072,7 +2947,6 @@ static void  Encyption_Rebuild(
        return;
 }
 
-
 /*+
  *
  * Routine Description:
@@ -3099,7 +2973,6 @@ s_vMgrFormatTIM(
        unsigned short wStartIndex = 0;
        unsigned short wEndIndex = 0;
 
-
        // Find size of partial virtual bitmap
        for (ii = 0; ii < (MAX_NODE_NUM + 1); ii++) {
                byMap = pMgmt->abyPSTxMap[ii];
@@ -3120,7 +2993,6 @@ s_vMgrFormatTIM(
                }
        }
 
-
        // Round start index down to nearest even number
        wStartIndex &=  ~BIT0;
 
@@ -3147,7 +3019,6 @@ s_vMgrFormatTIM(
        pTIM->byVirtBitMap[0]  &= ~BIT0;
 }
 
-
 /*+
  *
  * Routine Description:
@@ -3237,7 +3108,6 @@ s_MgrMakeBeacon(
        }
 
        if (pMgmt->eCurrMode == WMAC_MODE_IBSS_STA) {
-
                // IBSS parameter
                sFrame.pIBSSParms = (PWLAN_IE_IBSS_PARMS)(sFrame.pBuf + sFrame.len);
                sFrame.len += (2) + WLAN_IEHDR_LEN;
@@ -3371,10 +3241,6 @@ s_MgrMakeBeacon(
        return pTxPacket;
 }
 
-
-
-
-
 /*+
  *
  * Routine Description:
@@ -3386,9 +3252,6 @@ s_MgrMakeBeacon(
  *
  -*/
 
-
-
-
 PSTxMgmtPacket
 s_MgrMakeProbeResponse(
        PSDevice pDevice,
@@ -3412,7 +3275,6 @@ s_MgrMakeProbeResponse(
        PWLAN_IE_IBSS_DFS   pIBSSDFS = NULL;
        unsigned int ii;
 
-
        pTxPacket = (PSTxMgmtPacket)pMgmt->pbyMgmtPacketPool;
        memset(pTxPacket, 0, sizeof(STxMgmtPacket) + WLAN_PROBERESP_FR_MAXLEN);
        pTxPacket->p80211Header = (PUWLAN_80211HDR)((unsigned char *)pTxPacket + sizeof(STxMgmtPacket));
@@ -3536,7 +3398,6 @@ s_MgrMakeProbeResponse(
                sFrame.len += uLength;
        }
 
-
        if (((PWLAN_IE_SUPP_RATES)pCurrExtSuppRates)->len != 0) {
                sFrame.pExtSuppRates = (PWLAN_IE_SUPP_RATES)(sFrame.pBuf + sFrame.len);
                sFrame.len += ((PWLAN_IE_SUPP_RATES)pCurrExtSuppRates)->len + WLAN_IEHDR_LEN;
@@ -3564,8 +3425,6 @@ s_MgrMakeProbeResponse(
        return pTxPacket;
 }
 
-
-
 /*+
  *
  * Routine Description:
@@ -3577,7 +3436,6 @@ s_MgrMakeProbeResponse(
  *
  -*/
 
-
 PSTxMgmtPacket
 s_MgrMakeAssocRequest(
        PSDevice pDevice,
@@ -3595,7 +3453,6 @@ s_MgrMakeAssocRequest(
        unsigned char *pbyIEs;
        unsigned char *pbyRSN;
 
-
        pTxPacket = (PSTxMgmtPacket)pMgmt->pbyMgmtPacketPool;
        memset(pTxPacket, 0, sizeof(STxMgmtPacket) + WLAN_ASSOCREQ_FR_MAXLEN);
        pTxPacket->p80211Header = (PUWLAN_80211HDR)((unsigned char *)pTxPacket + sizeof(STxMgmtPacket));
@@ -3825,20 +3682,12 @@ s_MgrMakeAssocRequest(
                pbyIEs += sFrame.pRSN->len + WLAN_IEHDR_LEN;
        }
 
-
        // Adjust the length fields
        pTxPacket->cbMPDULen = sFrame.len;
        pTxPacket->cbPayloadLen = sFrame.len - WLAN_HDR_ADDR3_LEN;
        return pTxPacket;
 }
 
-
-
-
-
-
-
-
 /*+
  *
  * Routine Description:
@@ -3850,7 +3699,6 @@ s_MgrMakeAssocRequest(
  *
  -*/
 
-
 PSTxMgmtPacket
 s_MgrMakeReAssocRequest(
        PSDevice pDevice,
@@ -3868,7 +3716,6 @@ s_MgrMakeReAssocRequest(
        unsigned char *pbyIEs;
        unsigned char *pbyRSN;
 
-
        pTxPacket = (PSTxMgmtPacket)pMgmt->pbyMgmtPacketPool;
        memset(pTxPacket, 0, sizeof(STxMgmtPacket) + WLAN_REASSOCREQ_FR_MAXLEN);
        pTxPacket->p80211Header = (PUWLAN_80211HDR)((unsigned char *)pTxPacket + sizeof(STxMgmtPacket));
@@ -4081,7 +3928,6 @@ s_MgrMakeReAssocRequest(
                pbyIEs += sFrame.pRSN->len + WLAN_IEHDR_LEN;
        }
 
-
        /* Adjust the length fields */
        pTxPacket->cbMPDULen = sFrame.len;
        pTxPacket->cbPayloadLen = sFrame.len - WLAN_HDR_ADDR3_LEN;
@@ -4089,8 +3935,6 @@ s_MgrMakeReAssocRequest(
        return pTxPacket;
 }
 
-
-
 /*+
  *
  * Routine Description:
@@ -4102,7 +3946,6 @@ s_MgrMakeReAssocRequest(
  *
  -*/
 
-
 PSTxMgmtPacket
 s_MgrMakeAssocResponse(
        PSDevice pDevice,
@@ -4118,7 +3961,6 @@ s_MgrMakeAssocResponse(
        PSTxMgmtPacket      pTxPacket = NULL;
        WLAN_FR_ASSOCRESP   sFrame;
 
-
        pTxPacket = (PSTxMgmtPacket)pMgmt->pbyMgmtPacketPool;
        memset(pTxPacket, 0, sizeof(STxMgmtPacket) + WLAN_ASSOCREQ_FR_MAXLEN);
        pTxPacket->p80211Header = (PUWLAN_80211HDR)((unsigned char *)pTxPacket + sizeof(STxMgmtPacket));
@@ -4164,7 +4006,6 @@ s_MgrMakeAssocResponse(
        return pTxPacket;
 }
 
-
 /*+
  *
  * Routine Description:
@@ -4176,7 +4017,6 @@ s_MgrMakeAssocResponse(
  *
  -*/
 
-
 PSTxMgmtPacket
 s_MgrMakeReAssocResponse(
        PSDevice pDevice,
@@ -4192,7 +4032,6 @@ s_MgrMakeReAssocResponse(
        PSTxMgmtPacket      pTxPacket = NULL;
        WLAN_FR_REASSOCRESP   sFrame;
 
-
        pTxPacket = (PSTxMgmtPacket)pMgmt->pbyMgmtPacketPool;
        memset(pTxPacket, 0, sizeof(STxMgmtPacket) + WLAN_ASSOCREQ_FR_MAXLEN);
        pTxPacket->p80211Header = (PUWLAN_80211HDR)((unsigned char *)pTxPacket + sizeof(STxMgmtPacket));
@@ -4238,7 +4077,6 @@ s_MgrMakeReAssocResponse(
        return pTxPacket;
 }
 
-
 /*+
  *
  * Routine Description:
@@ -4265,7 +4103,6 @@ s_vMgrRxProbeResponse(
        unsigned char byIEChannel = 0;
        bool bChannelHit = true;
 
-
        memset(&sFrame, 0, sizeof(WLAN_FR_PROBERESP));
        // decode the frame
        sFrame.len = pRxPacket->cbMPDULen;
@@ -4314,7 +4151,6 @@ s_vMgrRxProbeResponse(
                sERP.byERP = 0;
        }
 
-
        // update or insert the bss
        pBSSList = BSSpAddrIsInBSSList((void *)pDevice, sFrame.pHdr->sA3.abyAddr3, sFrame.pSSID);
        if (pBSSList) {
@@ -4359,7 +4195,6 @@ s_vMgrRxProbeResponse(
 );
        }
        return;
-
 }
 
 /*+
@@ -4373,7 +4208,6 @@ s_vMgrRxProbeResponse(
  *
  -*/
 
-
 static
 void
 s_vMgrRxProbeRequest(
@@ -4391,7 +4225,6 @@ s_vMgrRxProbeRequest(
        // STA have to response this request.
        if ((pMgmt->eCurrMode == WMAC_MODE_ESS_AP) ||
            ((pMgmt->eCurrMode == WMAC_MODE_IBSS_STA) && pDevice->bBeaconSent)) {
-
                memset(&sFrame, 0, sizeof(WLAN_FR_PROBEREQ));
                // decode the frame
                sFrame.len = pRxPacket->cbMPDULen;
@@ -4445,10 +4278,6 @@ s_vMgrRxProbeRequest(
        return;
 }
 
-
-
-
-
 /*+
  *
  * Routine Description:
@@ -4463,7 +4292,6 @@ s_vMgrRxProbeRequest(
  *
  -*/
 
-
 void
 vMgrRxManagePacket(
        void *hDeviceContext,
@@ -4477,14 +4305,12 @@ vMgrRxManagePacket(
        NODE_STATE  eNodeState = 0;
        CMD_STATUS  Status;
 
-
        if (pMgmt->eCurrMode == WMAC_MODE_ESS_AP) {
                if (BSSDBbIsSTAInNodeDB(pMgmt, pRxPacket->p80211Header->sA3.abyAddr2, &uNodeIndex))
                        eNodeState = pMgmt->sNodeDBTable[uNodeIndex].eNodeState;
        }
 
        switch (WLAN_GET_FC_FSTYPE((pRxPacket->p80211Header->sA3.wFrameCtl))) {
-
        case WLAN_FSTYPE_ASSOCREQ:
                // Frame Clase = 2
                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "rx assocreq\n");
@@ -4598,9 +4424,6 @@ vMgrRxManagePacket(
        return;
 }
 
-
-
-
 /*+
  *
  * Routine Description:
@@ -4650,9 +4473,6 @@ bMgrPrepareBeaconToSend(
        return true;
 }
 
-
-
-
 /*+
  *
  * Routine Description:
@@ -4718,7 +4538,6 @@ s_vMgrLogStatus(
        }
 }
 
-
 /*
  *
  * Description:
@@ -4754,8 +4573,6 @@ bAdd_PMKID_Candidate(
        if (pDevice->gsPMKIDCandidate.NumCandidates >= MAX_PMKIDLIST)
                return false;
 
-
-
        // Update Old Candidate
        for (ii = 0; ii < pDevice->gsPMKIDCandidate.NumCandidates; ii++) {
                pCandidateList = &pDevice->gsPMKIDCandidate.CandidateList[ii];
@@ -4900,7 +4717,6 @@ s_bCipherMatch(
 
        // mask our cap. with BSS
        if (EncStatus == Ndis802_11Encryption1Enabled) {
-
                // For supporting Cisco migration mode, don't care pairwise key cipher
                if ((byMulticastCipher == KEY_CTL_WEP) &&
                    (byCipherMask == 0)) {
@@ -4956,5 +4772,3 @@ s_bCipherMatch(
        }
        return true;
 }
-
-