skyfall/rtl8188eu
1
0
Fork 0
mirror of https://github.com/lwfinger/rtl8188eu.git synced 2024-11-10 15:39:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rtl8188eu: Remove CONFIG_ATTEMPT_TO_FIX_AP_BEACON_ERROR

Browse source 
This symbol is always defined.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2015-03-03 21:49:36 -06:00
parent c291f6278d
commit c372b989e3
2 changed files with 19 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
core/rtw_mlme_ext.c
View file

@ -932,29 +932,29 @@ unsigned int OnBeacon(struct adapter *padapter, union recv_frame *precv_frame)
u8 *p = NULL; u8 *p = NULL;
u32 ielen = 0; u32 ielen = 0;
#ifdef CONFIG_ATTEMPT_TO_FIX_AP_BEACON_ERROR p = rtw_get_ie(pframe + sizeof(struct rtw_ieee80211_hdr_3addr) +
p = rtw_get_ie(pframe + sizeof(struct rtw_ieee80211_hdr_3addr) + _BEACON_IE_OFFSET_, _EXT_SUPPORTEDRATES_IE_, &ielen, precv_frame->u.hdr.len -sizeof(struct rtw_ieee80211_hdr_3addr) - _BEACON_IE_OFFSET_); _BEACON_IE_OFFSET_, _EXT_SUPPORTEDRATES_IE_, &ielen,
if ((p != NULL) && (ielen > 0)) precv_frame->u.hdr.len -
{ sizeof(struct rtw_ieee80211_hdr_3addr) -
if ((*(p + 1 + ielen) == 0x2D) && (*(p + 2 + ielen) != 0x2D)) _BEACON_IE_OFFSET_);
{ if ((p != NULL) && (ielen > 0)) {
/* Invalid value 0x2D is detected in Extended Supported Rates (ESR) IE. Try to fix the IE length to avoid failed Beacon parsing. */ if ((*(p + 1 + ielen) == 0x2D) && (*(p + 2 + ielen) != 0x2D)) {
DBG_871X("[WIFIDBG] Error in ESR IE is detected in Beacon of BSSID:"MAC_FMT". Fix the length of ESR IE to avoid failed Beacon parsing.\n", MAC_ARG(GetAddr3Ptr(pframe))); /* Invalid value 0x2D is detected in
* Extended Supported Rates (ESR) IE. Try to fix the IE
* length to avoid failed Beacon parsing. */
DBG_871X("[WIFIDBG] Error in ESR IE is detected in Beacon of BSSID:%pM. Fix the length of ESR IE to avoid failed Beacon parsing.\n",
GetAddr3Ptr(pframe));
*(p + 1) = ielen - 1; *(p + 1) = ielen - 1;
} }
} }
#endif
if (pmlmeext->sitesurvey_res.state == SCAN_PROCESS) if (pmlmeext->sitesurvey_res.state == SCAN_PROCESS) {
{
report_survey_event(padapter, precv_frame); report_survey_event(padapter, precv_frame);
return _SUCCESS; return _SUCCESS;
} }
if (_rtw_memcmp(GetAddr3Ptr(pframe), get_my_bssid(&pmlmeinfo->network), ETH_ALEN)) if (_rtw_memcmp(GetAddr3Ptr(pframe), get_my_bssid(&pmlmeinfo->network), ETH_ALEN)) {
{ if (pmlmeinfo->state & WIFI_FW_AUTH_NULL) {
if (pmlmeinfo->state & WIFI_FW_AUTH_NULL)
{
/* we should update current network before auth, or some IE is wrong */ /* we should update current network before auth, or some IE is wrong */
pbss = (WLAN_BSSID_EX*)rtw_malloc(sizeof(WLAN_BSSID_EX)); pbss = (WLAN_BSSID_EX*)rtw_malloc(sizeof(WLAN_BSSID_EX));
if (pbss) { if (pbss) {
@ -966,7 +966,10 @@ unsigned int OnBeacon(struct adapter *padapter, union recv_frame *precv_frame)
} }
/* check the vendor of the assoc AP */ /* check the vendor of the assoc AP */
pmlmeinfo->assoc_AP_vendor = check_assoc_AP(pframe+sizeof(struct rtw_ieee80211_hdr_3addr), len-sizeof(struct rtw_ieee80211_hdr_3addr)); pmlmeinfo->assoc_AP_vendor =
check_assoc_AP(pframe +
sizeof(struct rtw_ieee80211_hdr_3addr),
len - sizeof(struct rtw_ieee80211_hdr_3addr));
/* update TSF Value */ /* update TSF Value */
update_TSF(pmlmeext, pframe, len); update_TSF(pmlmeext, pframe, len);

2
include/autoconf.h
View file

@ -61,8 +61,6 @@
#define CONFIG_80211D #define CONFIG_80211D
#define CONFIG_ATTEMPT_TO_FIX_AP_BEACON_ERROR
/* /*
* Debug Related Config * Debug Related Config
*/ */