Staging: rt3070: remove DOT11_N_SUPPORT ifdefs
[firefly-linux-kernel-4.4.55.git] / drivers / staging / rt3070 / sta / assoc.c
index 5c33a895bf7fce79243eda1aee98849008daa922..afe983618823ab60d7118b1f6b4f6efae93545e6 100644 (file)
@@ -341,7 +341,6 @@ VOID MlmeAssocReqAction(
                        FrameLen += tmp;
                }
 
-#ifdef DOT11_N_SUPPORT
                // HT
                if ((pAd->MlmeAux.HtCapabilityLen > 0) && (pAd->CommonCfg.PhyMode >= PHY_11ABGN_MIXED))
                {
@@ -360,32 +359,14 @@ VOID MlmeAssocReqAction(
                        }
                        else
                        {
-#ifdef RT_BIG_ENDIAN
-                       HT_CAPABILITY_IE HtCapabilityTmp;
-#endif
-
-#ifndef RT_BIG_ENDIAN
                                MakeOutgoingFrame(pOutBuffer + FrameLen,            &TmpLen,
                                                          1,                                &HtCapIe,
                                                          1,                                &pAd->MlmeAux.HtCapabilityLen,
                                                         pAd->MlmeAux.HtCapabilityLen,          &pAd->MlmeAux.HtCapability,
                                                          END_OF_ARGS);
-#else
-                NdisZeroMemory(&HtCapabilityTmp, sizeof(HT_CAPABILITY_IE));
-                NdisMoveMemory(&HtCapabilityTmp, &pAd->MlmeAux.HtCapability, pAd->MlmeAux.HtCapabilityLen);
-                       *(USHORT *)(&HtCapabilityTmp.HtCapInfo) = SWAP16(*(USHORT *)(&HtCapabilityTmp.HtCapInfo));
-                       *(USHORT *)(&HtCapabilityTmp.ExtHtCapInfo) = SWAP16(*(USHORT *)(&HtCapabilityTmp.ExtHtCapInfo));
-
-                       MakeOutgoingFrame(pOutBuffer + FrameLen,         &TmpLen,
-                                                               1,                           &HtCapIe,
-                                                               1,                           &pAd->MlmeAux.HtCapabilityLen,
-                                                               pAd->MlmeAux.HtCapabilityLen,&HtCapabilityTmp,
-                                                               END_OF_ARGS);
-#endif
                        }
                        FrameLen += TmpLen;
                }
-#endif // DOT11_N_SUPPORT //
 
                // add Ralink proprietary IE to inform AP this STA is going to use AGGREGATION or PIGGY-BACK+AGGREGATION
                // Case I: (Aggregation + Piggy-Back)
@@ -473,11 +454,9 @@ VOID MlmeAssocReqAction(
                                RSNIe = IE_WPA2;
                        }
 
-#ifdef NATIVE_WPA_SUPPLICANT_SUPPORT
 #ifdef SIOCSIWGENIE
                        if (pAd->StaCfg.WpaSupplicantUP != 1)
 #endif // SIOCSIWGENIE //
-#endif // NATIVE_WPA_SUPPLICANT_SUPPORT //
                RTMPMakeRSNIE(pAd, pAd->StaCfg.AuthMode, pAd->StaCfg.WepStatus, BSS0);
 
             // Check for WPA PMK cache list
@@ -504,7 +483,6 @@ VOID MlmeAssocReqAction(
                                }
                        }
 
-#ifdef NATIVE_WPA_SUPPLICANT_SUPPORT
 #ifdef SIOCSIWGENIE
                        if (pAd->StaCfg.WpaSupplicantUP == 1)
                        {
@@ -514,7 +492,6 @@ VOID MlmeAssocReqAction(
                        }
                        else
 #endif
-#endif // NATIVE_WPA_SUPPLICANT_SUPPORT //
                        {
                                MakeOutgoingFrame(pOutBuffer + FrameLen,                &tmp,
                                                        1,                              &RSNIe,
@@ -525,11 +502,9 @@ VOID MlmeAssocReqAction(
 
                        FrameLen += tmp;
 
-#ifdef NATIVE_WPA_SUPPLICANT_SUPPORT
 #ifdef SIOCSIWGENIE
                        if (pAd->StaCfg.WpaSupplicantUP != 1)
 #endif
-#endif // NATIVE_WPA_SUPPLICANT_SUPPORT //
                        {
                    // Append Variable IE
                    NdisMoveMemory(pAd->StaCfg.ReqVarIEs + VarIesOffset, &RSNIe, 1);
@@ -581,34 +556,6 @@ VOID MlmeAssocReqAction(
                                                END_OF_ARGS);
                        FrameLen += tmp;
 
-                       //
-                       // Add CipherSuite CCKM or LeapTkip if setting.
-                       //
-#ifdef LEAP_SUPPORT
-                       if (LEAP_CCKM_ON(pAd))
-                       {
-                               MakeOutgoingFrame(pOutBuffer + FrameLen,        &tmp,
-                                               CipherSuiteCiscoCCKMLen,                CipherSuiteCiscoCCKM,
-                                               END_OF_ARGS);
-                               FrameLen += tmp;
-
-                               // Third add RSN
-                               NdisMoveMemory(pAd->StaCfg.ReqVarIEs + VarIesOffset, CipherSuiteCiscoCCKM, CipherSuiteCiscoCCKMLen); //Save CipherSuite
-                               VarIesOffset += CipherSuiteCiscoCCKMLen;
-                       }
-                       else if ((pAd->StaCfg.LeapAuthMode == CISCO_AuthModeLEAP) && (pAd->StaCfg.WepStatus == Ndis802_11Encryption2Enabled))
-                       {
-                               MakeOutgoingFrame(pOutBuffer + FrameLen, &tmp,
-                                               CipherSuiteCCXTkipLen,      CipherSuiteCCXTkip,
-                                               END_OF_ARGS);
-                               FrameLen += tmp;
-
-                               // Third add RSN
-                               NdisMoveMemory(pAd->StaCfg.ReqVarIEs + VarIesOffset, CipherSuiteCCXTkip, CipherSuiteCCXTkipLen);
-                               VarIesOffset += CipherSuiteCCXTkipLen;
-                       }
-#endif // LEAP_SUPPORT //
-
                        // Add by James 03/06/27
                        // Set Variable IEs Length
                        pAd->StaCfg.ReqVarIELen = VarIesOffset;
@@ -668,23 +615,6 @@ VOID MlmeReassocReqAction(
        NDIS_STATUS             NStatus;
        ULONG                   tmp;
        PUCHAR                  pOutBuffer = NULL;
-//CCX 2.X
-#ifdef LEAP_SUPPORT
-       UCHAR                   CkipFlag;
-       UCHAR                   CkipNegotiationBuffer[CKIP_NEGOTIATION_LENGTH];
-       UCHAR                   AironetCkipIe = IE_AIRONET_CKIP;
-       UCHAR                   AironetCkipLen = CKIP_NEGOTIATION_LENGTH;
-       UCHAR                   AironetIPAddressIE = IE_AIRONET_IPADDRESS;
-       UCHAR                   AironetIPAddressLen = AIRONET_IPADDRESS_LENGTH;
-       UCHAR                   AironetIPAddressBuffer[AIRONET_IPADDRESS_LENGTH] = {0x00, 0x40, 0x96, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00};
-       UCHAR                   AironetCCKMReassocIE = IE_AIRONET_CCKMREASSOC;
-       UCHAR                   AironetCCKMReassocLen = AIRONET_CCKMREASSOC_LENGTH;
-       UCHAR                   AironetCCKMReassocBuffer[AIRONET_CCKMREASSOC_LENGTH];
-       UCHAR                   AironetOUI[] = {0x00, 0x40, 0x96, 0x00};
-       UCHAR                   MICMN[16];
-       UCHAR                   CalcMicBuffer[80];
-       ULONG                   CalcMicBufferLen = 0;
-#endif // LEAP_SUPPORT //
        USHORT                  Status;
 
        // Block all authentication request durning WPA block period
@@ -759,7 +689,6 @@ VOID MlmeReassocReqAction(
                        FrameLen += tmp;
                }
 
-#ifdef DOT11_N_SUPPORT
                // HT
                if ((pAd->MlmeAux.HtCapabilityLen > 0) && (pAd->CommonCfg.PhyMode >= PHY_11ABGN_MIXED))
                {
@@ -786,7 +715,6 @@ VOID MlmeReassocReqAction(
                        }
                        FrameLen += TmpLen;
                }
-#endif // DOT11_N_SUPPORT //
 
                // add Ralink proprietary IE to inform AP this STA is going to use AGGREGATION or PIGGY-BACK+AGGREGATION
                // Case I: (Aggregation + Piggy-Back)
@@ -826,73 +754,6 @@ VOID MlmeReassocReqAction(
                                                          END_OF_ARGS);
                        FrameLen += TmpLen;
                }
-#ifdef LEAP_SUPPORT
-               if (LEAP_CCKM_ON(pAd) && (pAd->StaCfg.CCKMLinkUpFlag == TRUE))
-               {
-                       CkipFlag = pAd->StaCfg.CkipFlag;        // We have update that at PeerBeaconAtJoinRequest()
-                       if (CkipFlag != 0)
-                       {
-                               NdisZeroMemory(CkipNegotiationBuffer, CKIP_NEGOTIATION_LENGTH);
-                               CkipNegotiationBuffer[2] = 0x66;
-                               // Make it try KP & MIC, since we have to follow the result from AssocRsp
-                               CkipNegotiationBuffer[8] = 0x18;
-                               CkipNegotiationBuffer[CKIP_NEGOTIATION_LENGTH - 1] = 0x22;
-
-                               MakeOutgoingFrame(pOutBuffer + FrameLen,            &tmp,
-                                                                       1,                              &AironetCkipIe,
-                                                                       1,                              &AironetCkipLen,
-                                                                       AironetCkipLen,                 CkipNegotiationBuffer,
-                                                                       END_OF_ARGS);
-                               FrameLen += tmp;
-                       }
-
-                       MakeOutgoingFrame(pOutBuffer + FrameLen, &tmp,
-                                                       1,                              &AironetIPAddressIE,
-                                                       1,                              &AironetIPAddressLen,
-                                                       AironetIPAddressLen,            AironetIPAddressBuffer,
-                                                       END_OF_ARGS);
-                       FrameLen += tmp;
-
-                       //
-                       // The RN is incremented before each reassociation request.
-                       //
-                       pAd->StaCfg.CCKMRN++;
-                       //
-                       // Calculate MIC = hmac-md5(krk, STA-ID|BSSID|RSNIE|TSF|RN);
-                       //
-                       COPY_MAC_ADDR(CalcMicBuffer, pAd->CurrentAddress);
-                       CalcMicBufferLen = MAC_ADDR_LEN;
-                       COPY_MAC_ADDR(CalcMicBuffer + CalcMicBufferLen, pAd->MlmeAux.Bssid);
-                       CalcMicBufferLen += MAC_ADDR_LEN;
-                       NdisMoveMemory(CalcMicBuffer + CalcMicBufferLen, CipherSuiteCiscoCCKM, CipherSuiteCiscoCCKMLen);
-                       CalcMicBufferLen += CipherSuiteCiscoCCKMLen;
-                       NdisMoveMemory(CalcMicBuffer + CalcMicBufferLen, (PUCHAR) &pAd->StaCfg.CCKMBeaconAtJoinTimeStamp, sizeof(pAd->StaCfg.CCKMBeaconAtJoinTimeStamp));
-                       CalcMicBufferLen += sizeof(pAd->StaCfg.CCKMBeaconAtJoinTimeStamp);
-                       NdisMoveMemory(CalcMicBuffer + CalcMicBufferLen, (PUCHAR)&pAd->StaCfg.CCKMRN, sizeof(pAd->StaCfg.CCKMRN));
-                       CalcMicBufferLen += sizeof(pAd->StaCfg.CCKMRN);
-                       hmac_md5(pAd->StaCfg.KRK, LEN_EAP_MICK, CalcMicBuffer, CalcMicBufferLen, MICMN);
-
-                       //
-                       // fill up CCKM reassociation request element
-                       //
-                       NdisMoveMemory(AironetCCKMReassocBuffer, AironetOUI, 4);
-                       NdisMoveMemory(AironetCCKMReassocBuffer + 4, (PUCHAR)&pAd->StaCfg.CCKMBeaconAtJoinTimeStamp, 8);
-                       NdisMoveMemory(AironetCCKMReassocBuffer + 12, (PUCHAR) &pAd->StaCfg.CCKMRN, 4);
-                       NdisMoveMemory(AironetCCKMReassocBuffer +16, MICMN, 8);
-
-                       MakeOutgoingFrame(pOutBuffer + FrameLen, &tmp,
-                                                       1,                      &AironetCCKMReassocIE,
-                                                       1,                      &AironetCCKMReassocLen,
-                                                       AironetCCKMReassocLen,  AironetCCKMReassocBuffer,
-                                                       END_OF_ARGS);
-                       FrameLen += tmp;
-
-                       MakeOutgoingFrame(pOutBuffer + FrameLen, &tmp,
-                                                       CipherSuiteCiscoCCKMLen,CipherSuiteCiscoCCKM,
-                                                       END_OF_ARGS);
-                       FrameLen += tmp;
-               }
-#endif // LEAP_SUPPORT //
 
                // Add CCX v2 request if CCX2 admin state is on
                if (pAd->StaCfg.CCXControl.field.Enable == 1)
@@ -948,36 +809,6 @@ VOID MlmeDisassocReqAction(
        ULONG                 Timeout = 0;
        USHORT                Status;
 
-#ifdef QOS_DLS_SUPPORT
-       // send DLS-TEAR_DOWN message,
-       if (pAd->CommonCfg.bDLSCapable)
-       {
-               UCHAR i;
-
-               // tear down local dls table entry
-               for (i=0; i<MAX_NUM_OF_INIT_DLS_ENTRY; i++)
-               {
-                       if (pAd->StaCfg.DLSEntry[i].Valid && (pAd->StaCfg.DLSEntry[i].Status == DLS_FINISH))
-                       {
-                               RTMPSendDLSTearDownFrame(pAd, pAd->StaCfg.DLSEntry[i].MacAddr);
-                               pAd->StaCfg.DLSEntry[i].Status  = DLS_NONE;
-                               pAd->StaCfg.DLSEntry[i].Valid   = FALSE;
-                       }
-               }
-
-               // tear down peer dls table entry
-               for (i=MAX_NUM_OF_INIT_DLS_ENTRY; i<MAX_NUM_OF_DLS_ENTRY; i++)
-               {
-                       if (pAd->StaCfg.DLSEntry[i].Valid && (pAd->StaCfg.DLSEntry[i].Status == DLS_FINISH))
-                       {
-                               RTMPSendDLSTearDownFrame(pAd, pAd->StaCfg.DLSEntry[i].MacAddr);
-                               pAd->StaCfg.DLSEntry[i].Status = DLS_NONE;
-                               pAd->StaCfg.DLSEntry[i].Valid   = FALSE;
-                       }
-               }
-       }
-#endif // QOS_DLS_SUPPORT //
-
        // skip sanity check
        pDisassocReq = (PMLME_DISASSOC_REQ_STRUCT)(Elem->Msg);
 
@@ -1020,27 +851,11 @@ VOID MlmeDisassocReqAction(
        RTMPSetTimer(&pAd->MlmeAux.DisassocTimer, Timeout); /* in mSec */
        pAd->Mlme.AssocMachine.CurrState = DISASSOC_WAIT_RSP;
 
-#ifdef WPA_SUPPLICANT_SUPPORT
-#ifndef NATIVE_WPA_SUPPLICANT_SUPPORT
-    if (pAd->StaCfg.WpaSupplicantUP != WPA_SUPPLICANT_DISABLE)
-       {
-        union iwreq_data    wrqu;
-        //send disassociate event to wpa_supplicant
-        memset(&wrqu, 0, sizeof(wrqu));
-        wrqu.data.flags = RT_DISASSOC_EVENT_FLAG;
-        wireless_send_event(pAd->net_dev, IWEVCUSTOM, &wrqu, NULL);
-    }
-#endif // NATIVE_WPA_SUPPLICANT_SUPPORT //
-#endif // WPA_SUPPLICANT_SUPPORT //
-
-#ifdef NATIVE_WPA_SUPPLICANT_SUPPORT
     {
         union iwreq_data    wrqu;
         memset(wrqu.ap_addr.sa_data, 0, MAC_ADDR_LEN);
         wireless_send_event(pAd->net_dev, SIOCGIWAP, &wrqu, NULL);
     }
-#endif // NATIVE_WPA_SUPPLICANT_SUPPORT //
-
 }
 
 /*
@@ -1078,9 +893,7 @@ VOID PeerAssocRspAction(
                if(MAC_ADDR_EQUAL(Addr2, pAd->MlmeAux.Bssid))
                {
                        DBGPRINT(RT_DEBUG_TRACE, ("PeerAssocRspAction():ASSOC - receive ASSOC_RSP to me (status=%d)\n", Status));
-#ifdef DOT11_N_SUPPORT
                        DBGPRINT(RT_DEBUG_TRACE, ("PeerAssocRspAction():MacTable [%d].AMsduSize = %d. ClientStatusFlags = 0x%lx \n",Elem->Wcid, pAd->MacTab.Content[BSSID_WCID].AMsduSize, pAd->MacTab.Content[BSSID_WCID].ClientStatusFlags));
-#endif // DOT11_N_SUPPORT //
                        RTMPCancelTimer(&pAd->MlmeAux.AssocTimer, &TimerCancelled);
                        if(Status == MLME_SUCCESS)
                        {
@@ -1120,14 +933,6 @@ VOID PeerAssocRspAction(
                        }
                        else
                        {
-                               // Faile on Association, we need to check the status code
-                               // Is that a Rogue AP?
-#ifdef LEAP_SUPPORT
-                               if ((pAd->StaCfg.LeapAuthMode == CISCO_AuthModeLEAP) && (Status == MLME_ALG_NOT_SUPPORT))
-                               { //Possibly Rogue AP
-                                       RogueApTableSetEntry(pAd, &pAd->StaCfg.RogueApTab, pAd->MlmeAux.Bssid, LEAP_REASON_INVALID_AUTH);
-                               }
-#endif // LEAP_SUPPORT //
                        }
                        pAd->Mlme.AssocMachine.CurrState = ASSOC_IDLE;
                        MlmeEnqueue(pAd, MLME_CNTL_STATE_MACHINE, MT2_ASSOC_CONF, 2, &Status);
@@ -1183,21 +988,6 @@ VOID PeerReassocRspAction(
                                AssocPostProc(pAd, Addr2, CapabilityInfo, Aid, SupRate, SupRateLen, ExtRate, ExtRateLen,
                                         &EdcaParm, &HtCapability, HtCapabilityLen, &AddHtInfo);
 
-#ifdef WPA_SUPPLICANT_SUPPORT
-#ifndef NATIVE_WPA_SUPPLICANT_SUPPORT
-                if (pAd->StaCfg.WpaSupplicantUP != WPA_SUPPLICANT_DISABLE)
-                {
-                    union iwreq_data    wrqu;
-
-                    SendAssocIEsToWpaSupplicant(pAd);
-                    memset(&wrqu, 0, sizeof(wrqu));
-                    wrqu.data.flags = RT_ASSOC_EVENT_FLAG;
-                    wireless_send_event(pAd->net_dev, IWEVCUSTOM, &wrqu, NULL);
-                }
-#endif // NATIVE_WPA_SUPPLICANT_SUPPORT //
-#endif // WPA_SUPPLICANT_SUPPORT //
-
-#ifdef NATIVE_WPA_SUPPLICANT_SUPPORT
                 {
                     union iwreq_data    wrqu;
                     wext_notify_event_assoc(pAd);
@@ -1207,41 +997,9 @@ VOID PeerReassocRspAction(
                     wireless_send_event(pAd->net_dev, SIOCGIWAP, &wrqu, NULL);
 
                 }
-#endif // NATIVE_WPA_SUPPLICANT_SUPPORT //
 
                        }
 
-                       //
-                       // Cisco Leap CCKM supported Re-association.
-                       //
-#ifdef LEAP_SUPPORT
-                       if (LEAP_CCKM_ON(pAd) && (pAd->StaCfg.CCKMLinkUpFlag == TRUE))
-                       {
-                               if (CCKMAssocRspSanity(pAd, Elem->Msg, Elem->MsgLen) == TRUE)
-                               {
-                                       pAd->StaCfg.CkipFlag = CkipFlag;
-                                       if (CkipFlag & 0x18)
-                                       {
-                                               NdisZeroMemory(pAd->StaCfg.TxSEQ, 4);
-                                               NdisZeroMemory(pAd->StaCfg.RxSEQ, 4);
-                                               NdisZeroMemory(pAd->StaCfg.CKIPMIC, 4);
-                                               pAd->StaCfg.GIV[0] = RandomByte(pAd);
-                                               pAd->StaCfg.GIV[1] = RandomByte(pAd);
-                                               pAd->StaCfg.GIV[2] = RandomByte(pAd);
-                                               pAd->StaCfg.bCkipOn = TRUE;
-                                               DBGPRINT(RT_DEBUG_TRACE, ("<CCX> pAd->StaCfg.CkipFlag = 0x%02x\n", pAd->StaCfg.CkipFlag));
-                                       }
-
-                                       pAd->Mlme.AssocMachine.CurrState = ASSOC_IDLE;
-                                       MlmeEnqueue(pAd, MLME_CNTL_STATE_MACHINE, MT2_REASSOC_CONF, 2, &Status);
-                               }
-                               else
-                               {
-                                       DBGPRINT(RT_DEBUG_TRACE, ("ASSOC - CCKMAssocRspSanity() sanity check fail\n"));
-                               }
-                       }
-                       else
-#endif // LEAP_SUPPORT //
                        {
                                // CkipFlag is no use for reassociate
                                pAd->Mlme.AssocMachine.CurrState = ASSOC_IDLE;
@@ -1286,7 +1044,7 @@ VOID AssocPostProc(
        COPY_MAC_ADDR(pAd->MlmeAux.Bssid, pAddr2);
        pAd->MlmeAux.Aid = Aid;
        pAd->MlmeAux.CapabilityInfo = CapabilityInfo & SUPPORTED_CAPABILITY_INFO;
-#ifdef DOT11_N_SUPPORT
+
        // Some HT AP might lost WMM IE. We add WMM ourselves. beacuase HT requires QoS on.
        if ((HtCapabilityLen > 0) && (pEdcaParm->bValid == FALSE))
        {
@@ -1312,7 +1070,6 @@ VOID AssocPostProc(
                pEdcaParm->Txop[3]  = 48;
 
        }
-#endif // DOT11_N_SUPPORT //
 
        NdisMoveMemory(&pAd->MlmeAux.APEdcaParm, pEdcaParm, sizeof(EDCA_PARM));
 
@@ -1326,7 +1083,6 @@ VOID AssocPostProc(
        NdisMoveMemory(pAd->MlmeAux.ExtRate, ExtRate, ExtRateLen);
        RTMPCheckRates(pAd, pAd->MlmeAux.ExtRate, &pAd->MlmeAux.ExtRateLen);
 
-#ifdef DOT11_N_SUPPORT
        if (HtCapabilityLen > 0)
        {
                RTMPCheckHt(pAd, BSSID_WCID, pHtCapability, pAddHtInfo);
@@ -1335,7 +1091,6 @@ VOID AssocPostProc(
 
        DBGPRINT(RT_DEBUG_TRACE, ("AssocPostProc===>    (Mmps=%d, AmsduSize=%d, )\n",
                pAd->MacTab.Content[BSSID_WCID].MmpsMode, pAd->MacTab.Content[BSSID_WCID].AMsduSize));
-#endif // DOT11_N_SUPPORT //
 
        // Set New WPA information
        Idx = BssTableSearch(&pAd->ScanTab, pAddr2, pAd->MlmeAux.Channel);
@@ -1425,21 +1180,6 @@ VOID PeerDisassocAction(
                                RTMPSendWirelessEvent(pAd, IW_DISASSOC_EVENT_FLAG, pAd->MacTab.Content[BSSID_WCID].Addr, BSS0, 0);
                        }
 
-
-#ifdef LEAP_SUPPORT
-                       if (pAd->StaCfg.LeapAuthMode == CISCO_AuthModeLEAP)
-                       {
-                               // Cisco_LEAP has start a timer
-                               // We should cancel it if using LEAP
-                               RTMPCancelTimer(&pAd->StaCfg.LeapAuthTimer, &TimerCancelled);
-                               //Check is it mach the LEAP Authentication failed as possible a Rogue AP
-                               //on it's PortSecured not equal to WPA_802_1X_PORT_SECURED while process the Association.
-                               if ((pAd->Mlme.LeapMachine.CurrState != LEAP_IDLE) && (pAd->StaCfg.PortSecured != WPA_802_1X_PORT_SECURED))
-                               {
-                                       RogueApTableSetEntry(pAd, &pAd->StaCfg.RogueApTab, Addr2, LEAP_REASON_AUTH_TIMEOUT);
-                               }
-                       }
-#endif // LEAP_SUPPORT //
                        //
                        // Get Current System time and Turn on AdjacentAPReport
                        //
@@ -1448,26 +1188,11 @@ VOID PeerDisassocAction(
                        LinkDown(pAd, TRUE);
                        pAd->Mlme.AssocMachine.CurrState = ASSOC_IDLE;
 
-#ifdef WPA_SUPPLICANT_SUPPORT
-#ifndef NATIVE_WPA_SUPPLICANT_SUPPORT
-            if (pAd->StaCfg.WpaSupplicantUP != WPA_SUPPLICANT_DISABLE)
-                       {
-                union iwreq_data    wrqu;
-                //send disassociate event to wpa_supplicant
-                memset(&wrqu, 0, sizeof(wrqu));
-                wrqu.data.flags = RT_DISASSOC_EVENT_FLAG;
-                wireless_send_event(pAd->net_dev, IWEVCUSTOM, &wrqu, NULL);
-            }
-#endif // NATIVE_WPA_SUPPLICANT_SUPPORT //
-#endif // WPA_SUPPLICANT_SUPPORT //
-
-#ifdef NATIVE_WPA_SUPPLICANT_SUPPORT
             {
                 union iwreq_data    wrqu;
                 memset(wrqu.ap_addr.sa_data, 0, MAC_ADDR_LEN);
                 wireless_send_event(pAd->net_dev, SIOCGIWAP, &wrqu, NULL);
             }
-#endif // NATIVE_WPA_SUPPLICANT_SUPPORT //
                }
        }
        else
@@ -1750,36 +1475,6 @@ VOID SwitchBetweenWepAndCkip(
        }
 }
 
-#ifdef WPA_SUPPLICANT_SUPPORT
-#ifndef NATIVE_WPA_SUPPLICANT_SUPPORT
-VOID    SendAssocIEsToWpaSupplicant(
-    IN  PRTMP_ADAPTER pAd)
-{
-    union iwreq_data    wrqu;
-    unsigned char custom[IW_CUSTOM_MAX] = {0};
-
-    if ((pAd->StaCfg.ReqVarIELen + 17) <= IW_CUSTOM_MAX)
-    {
-        sprintf(custom, "ASSOCINFO_ReqIEs=");
-           NdisMoveMemory(custom+17, pAd->StaCfg.ReqVarIEs, pAd->StaCfg.ReqVarIELen);
-           memset(&wrqu, 0, sizeof(wrqu));
-        wrqu.data.length = pAd->StaCfg.ReqVarIELen + 17;
-        wrqu.data.flags = RT_REQIE_EVENT_FLAG;
-        wireless_send_event(pAd->net_dev, IWEVCUSTOM, &wrqu, custom);
-
-        memset(&wrqu, 0, sizeof(wrqu));
-        wrqu.data.flags = RT_ASSOCINFO_EVENT_FLAG;
-        wireless_send_event(pAd->net_dev, IWEVCUSTOM, &wrqu, NULL);
-    }
-    else
-        DBGPRINT(RT_DEBUG_TRACE, ("pAd->StaCfg.ReqVarIELen + 17 > MAX_CUSTOM_LEN\n"));
-
-    return;
-}
-#endif // NATIVE_WPA_SUPPLICANT_SUPPORT //
-#endif // WPA_SUPPLICANT_SUPPORT //
-
-#ifdef NATIVE_WPA_SUPPLICANT_SUPPORT
 int wext_notify_event_assoc(
        IN  RTMP_ADAPTER *pAd)
 {
@@ -1812,8 +1507,6 @@ int wext_notify_event_assoc(
        return 0;
 
 }
-#endif // NATIVE_WPA_SUPPLICANT_SUPPORT //
-
 
 BOOLEAN StaAddMacTableEntry(
        IN  PRTMP_ADAPTER               pAd,
@@ -1848,11 +1541,9 @@ BOOLEAN StaAddMacTableEntry(
     if ((pAd->CommonCfg.PhyMode == PHY_11G) && (MaxSupportedRate < RATE_FIRST_OFDM_RATE))
         return FALSE;
 
-#ifdef DOT11_N_SUPPORT
        // 11n only
        if (((pAd->CommonCfg.PhyMode == PHY_11N_2_4G) || (pAd->CommonCfg.PhyMode == PHY_11N_5G))&& (HtCapabilityLen == 0))
                return FALSE;
-#endif // DOT11_N_SUPPORT //
 
        if (!pEntry)
         return FALSE;
@@ -1898,7 +1589,6 @@ BOOLEAN StaAddMacTableEntry(
                CLIENT_STATUS_CLEAR_FLAG(pEntry, fCLIENT_STATUS_PIGGYBACK_CAPABLE);
        }
 
-#ifdef DOT11_N_SUPPORT
        // If this Entry supports 802.11n, upgrade to HT rate.
        if ((HtCapabilityLen != 0) && (pAd->CommonCfg.PhyMode >= PHY_11ABGN_MIXED))
        {
@@ -1997,7 +1687,6 @@ BOOLEAN StaAddMacTableEntry(
        }
 
        NdisMoveMemory(&pEntry->HTCapability, pHtCapability, sizeof(HT_CAPABILITY_IE));
-#endif // DOT11_N_SUPPORT //
 
        pEntry->HTPhyMode.word = pEntry->MaxHTPhyMode.word;
        pEntry->CurrTxRate = pEntry->MaxSupportedRate;
@@ -2029,21 +1718,6 @@ BOOLEAN StaAddMacTableEntry(
 
        NdisReleaseSpinLock(&pAd->MacTabLock);
 
-#ifdef WPA_SUPPLICANT_SUPPORT
-#ifndef NATIVE_WPA_SUPPLICANT_SUPPORT
-    if (pAd->StaCfg.WpaSupplicantUP)
-    {
-        union iwreq_data    wrqu;
-
-        SendAssocIEsToWpaSupplicant(pAd);
-        memset(&wrqu, 0, sizeof(wrqu));
-        wrqu.data.flags = RT_ASSOC_EVENT_FLAG;
-        wireless_send_event(pAd->net_dev, IWEVCUSTOM, &wrqu, NULL);
-    }
-#endif // NATIVE_WPA_SUPPLICANT_SUPPORT //
-#endif // WPA_SUPPLICANT_SUPPORT //
-
-#ifdef NATIVE_WPA_SUPPLICANT_SUPPORT
     {
         union iwreq_data    wrqu;
         wext_notify_event_assoc(pAd);
@@ -2053,7 +1727,6 @@ BOOLEAN StaAddMacTableEntry(
         wireless_send_event(pAd->net_dev, SIOCGIWAP, &wrqu, NULL);
 
     }
-#endif // NATIVE_WPA_SUPPLICANT_SUPPORT //
        return TRUE;
 }