skyfall/rtl8188eu
1
0
Fork 0
mirror of https://github.com/lwfinger/rtl8188eu.git synced 2024-11-25 22:13:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rtl8188eu: Remove CONFIG_PATCH_JOIN_WRONG_CHANNEL - not defined

Browse source 
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2013-07-21 22:03:50 -05:00
parent 5e06e98779
commit e9bc67fa4f
1 changed files with 5 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
core/rtw_mlme_ext.c
View file

@ -866,22 +866,8 @@ unsigned int OnBeacon(_adapter *padapter, union recv_frame *precv_frame)
return _SUCCESS; return _SUCCESS;
} }
if (((pmlmeinfo->state&0x03) == WIFI_FW_STATION_STATE) && (pmlmeinfo->state & WIFI_FW_ASSOC_SUCCESS)) if (((pmlmeinfo->state&0x03) == WIFI_FW_STATION_STATE) && (pmlmeinfo->state & WIFI_FW_ASSOC_SUCCESS)) {
{ if ((psta = rtw_get_stainfo(pstapriv, GetAddr2Ptr(pframe))) != NULL) {
if ((psta = rtw_get_stainfo(pstapriv, GetAddr2Ptr(pframe))) != NULL)
{
#ifdef CONFIG_PATCH_JOIN_WRONG_CHANNEL
/* Merge from 8712 FW code */
if (cmp_pkt_chnl_diff(padapter,pframe,len) != 0)
{ /* join wrong channel, deauth and reconnect */
issue_deauth(padapter, (&(pmlmeinfo->network))->MacAddress, WLAN_REASON_DEAUTH_LEAVING);
report_del_sta_event(padapter,(&(pmlmeinfo->network))->MacAddress, WLAN_REASON_JOIN_WRONG_CHANNEL);
pmlmeinfo->state &= (~WIFI_FW_ASSOC_SUCCESS);
return _SUCCESS;
}
#endif /* CONFIG_PATCH_JOIN_WRONG_CHANNEL */
ret = rtw_check_bcn_info(padapter, pframe, len); ret = rtw_check_bcn_info(padapter, pframe, len);
if (!ret) { if (!ret) {
DBG_88E_LEVEL(_drv_info_, "ap has changed, disconnect now\n "); DBG_88E_LEVEL(_drv_info_, "ap has changed, disconnect now\n ");
@ -891,33 +877,20 @@ unsigned int OnBeacon(_adapter *padapter, union recv_frame *precv_frame)
/* update WMM, ERP in the beacon */ /* update WMM, ERP in the beacon */
/* todo: the timer is used instead of the number of the beacon received */ /* todo: the timer is used instead of the number of the beacon received */
if ((sta_rx_pkts(psta) & 0xf) == 0) if ((sta_rx_pkts(psta) & 0xf) == 0)
{
/* DBG_88E("update_bcn_info\n"); */
update_beacon_info(padapter, pframe, len, psta); update_beacon_info(padapter, pframe, len, psta);
}
process_p2p_ps_ie(padapter, (pframe + WLAN_HDR_A3_LEN), (len - WLAN_HDR_A3_LEN)); process_p2p_ps_ie(padapter, (pframe + WLAN_HDR_A3_LEN), (len - WLAN_HDR_A3_LEN));
} }
} } else if ((pmlmeinfo->state&0x03) == WIFI_FW_ADHOC_STATE) {
else if ((pmlmeinfo->state&0x03) == WIFI_FW_ADHOC_STATE) if ((psta = rtw_get_stainfo(pstapriv, GetAddr2Ptr(pframe))) != NULL) {
{
if ((psta = rtw_get_stainfo(pstapriv, GetAddr2Ptr(pframe))) != NULL)
{
/* update WMM, ERP in the beacon */ /* update WMM, ERP in the beacon */
/* todo: the timer is used instead of the number of the beacon received */ /* todo: the timer is used instead of the number of the beacon received */
if ((sta_rx_pkts(psta) & 0xf) == 0) if ((sta_rx_pkts(psta) & 0xf) == 0)
{
/* DBG_88E("update_bcn_info\n"); */
update_beacon_info(padapter, pframe, len, psta); update_beacon_info(padapter, pframe, len, psta);
}
} } else {
else
{
/* allocate a new CAM entry for IBSS station */ /* allocate a new CAM entry for IBSS station */
if ((cam_idx = allocate_fw_sta_entry(padapter)) == NUM_STA) if ((cam_idx = allocate_fw_sta_entry(padapter)) == NUM_STA)
{
goto _END_ONBEACON_; goto _END_ONBEACON_;
}
/* get supported rate */ /* get supported rate */
if (update_sta_support_rate(padapter, (pframe + WLAN_HDR_A3_LEN + _BEACON_IE_OFFSET_), (len - WLAN_HDR_A3_LEN - _BEACON_IE_OFFSET_), cam_idx) == _FAIL) if (update_sta_support_rate(padapter, (pframe + WLAN_HDR_A3_LEN + _BEACON_IE_OFFSET_), (len - WLAN_HDR_A3_LEN - _BEACON_IE_OFFSET_), cam_idx) == _FAIL)