|
@@ -840,27 +840,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 //
|
|
|
-
|
|
|
}
|
|
|
|
|
|
/*
|
|
@@ -908,21 +892,6 @@ VOID PeerAssocRspAction(
|
|
|
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);
|
|
@@ -932,8 +901,6 @@ VOID PeerAssocRspAction(
|
|
|
wireless_send_event(pAd->net_dev, SIOCGIWAP, &wrqu, NULL);
|
|
|
|
|
|
}
|
|
|
-#endif // NATIVE_WPA_SUPPLICANT_SUPPORT //
|
|
|
-
|
|
|
|
|
|
pAd->StaCfg.CkipFlag = CkipFlag;
|
|
|
if (CkipFlag & 0x18)
|
|
@@ -1005,21 +972,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);
|
|
@@ -1029,7 +981,6 @@ VOID PeerReassocRspAction(
|
|
|
wireless_send_event(pAd->net_dev, SIOCGIWAP, &wrqu, NULL);
|
|
|
|
|
|
}
|
|
|
-#endif // NATIVE_WPA_SUPPLICANT_SUPPORT //
|
|
|
|
|
|
}
|
|
|
|
|
@@ -1224,26 +1175,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
|
|
@@ -1526,36 +1462,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)
|
|
|
{
|
|
@@ -1588,5 +1494,3 @@ int wext_notify_event_assoc(
|
|
|
return 0;
|
|
|
|
|
|
}
|
|
|
-#endif // NATIVE_WPA_SUPPLICANT_SUPPORT //
|
|
|
-
|