From 0f3cbc1f0fa94c4181c2b9fb2986d6d016db5408 Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Fri, 20 Feb 2015 10:05:28 -0600 Subject: [PATCH] rtl8188eu: Remove CONFIG_ATMEL_RC_PATCH This quirk is never selected. Signed-off-by: Larry Finger --- core/rtw_ap.c | 22 ---------------- core/rtw_mlme_ext.c | 61 +-------------------------------------------- core/rtw_sta_mgt.c | 13 ---------- include/autoconf.h | 3 --- include/sta_info.h | 10 -------- 5 files changed, 1 insertion(+), 108 deletions(-) diff --git a/core/rtw_ap.c b/core/rtw_ap.c index 12d70a7..1e4366b 100755 --- a/core/rtw_ap.c +++ b/core/rtw_ap.c @@ -369,13 +369,6 @@ void expire_timeout_chk(struct adapter *padapter) psta = LIST_CONTAINOR(plist, struct sta_info, auth_list); plist = get_next(plist); - -#ifdef CONFIG_ATMEL_RC_PATCH - if (true == _rtw_memcmp((void *)(pstapriv->atmel_rc_pattern), (void *)(psta->hwaddr), ETH_ALEN)) - continue; - if (psta->flag_atmel_rc) - continue; -#endif if(psta->expire_to>0) { psta->expire_to--; @@ -420,15 +413,6 @@ void expire_timeout_chk(struct adapter *padapter) { psta = LIST_CONTAINOR(plist, struct sta_info, asoc_list); plist = get_next(plist); -#ifdef CONFIG_ATMEL_RC_PATCH - DBG_871X("%s:%d psta=%p, %02x,%02x||%02x,%02x \n\n", __func__, __LINE__, - psta,pstapriv->atmel_rc_pattern[0], pstapriv->atmel_rc_pattern[5], psta->hwaddr[0], psta->hwaddr[5]); - if (true == _rtw_memcmp((void *)pstapriv->atmel_rc_pattern, (void *)(psta->hwaddr), ETH_ALEN)) - continue; - if (psta->flag_atmel_rc) - continue; - DBG_871X("%s: debug line:%d \n", __func__, __LINE__); -#endif if (chk_sta_is_alive(psta) || !psta->expire_to) { psta->expire_to = pstapriv->expire_to; psta->keep_alive_trycnt = 0; @@ -543,12 +527,6 @@ if (chk_alive_num) { int ret = _FAIL; psta = rtw_get_stainfo_by_offset(pstapriv, chk_alive_list[i]); -#ifdef CONFIG_ATMEL_RC_PATCH - if (true == _rtw_memcmp( pstapriv->atmel_rc_pattern, psta->hwaddr, ETH_ALEN)) - continue; - if (psta->flag_atmel_rc) - continue; -#endif if(!(psta->state &_FW_LINKED)) continue; diff --git a/core/rtw_mlme_ext.c b/core/rtw_mlme_ext.c index a264035..4b27bae 100755 --- a/core/rtw_mlme_ext.c +++ b/core/rtw_mlme_ext.c @@ -770,15 +770,6 @@ unsigned int OnProbeReq(struct adapter *padapter, union recv_frame *precv_frame) uint len = precv_frame->u.hdr.len; u8 is_valid_p2p_probereq = false; -#ifdef CONFIG_ATMEL_RC_PATCH - u8 *target_ie=NULL, *wps_ie=NULL; - u8 *start; - uint search_len = 0, wps_ielen = 0, target_ielen = 0; - struct sta_info *psta; - struct sta_priv *pstapriv = &padapter->stapriv; -#endif - - #ifdef CONFIG_P2P struct wifidirect_info *pwdinfo = &(padapter->wdinfo); struct rx_pkt_attrib *pattrib = &precv_frame->u.hdr.attrib; @@ -840,44 +831,18 @@ _continue: return _SUCCESS; } - - /* DBG_871X("+OnProbeReq\n"); */ - - -#ifdef CONFIG_ATMEL_RC_PATCH - if ((wps_ie = rtw_get_wps_ie( - pframe + WLAN_HDR_A3_LEN + _PROBEREQ_IE_OFFSET_, - len - WLAN_HDR_A3_LEN - _PROBEREQ_IE_OFFSET_, - NULL, &wps_ielen))) { - - target_ie = rtw_get_wps_attr_content( wps_ie, wps_ielen, WPS_ATTR_MANUFACTURER, NULL, &target_ielen); - } - if ((target_ie && (target_ielen == 4)) && (true ==_rtw_memcmp((void *)target_ie, "Ozmo",4 ))) { - /* psta->flag_atmel_rc = 1; */ - unsigned char *sa_addr = get_sa(pframe); - DBG_871X("%s: Find Ozmo RC -- %02x:%02x:%02x:%02x:%02x:%02x \n\n", - __func__, *sa_addr, *(sa_addr+1), *(sa_addr+2), *(sa_addr+3), *(sa_addr+4), *(sa_addr+5)); - memcpy( pstapriv->atmel_rc_pattern, get_sa(pframe), ETH_ALEN); - } -#endif p = rtw_get_ie(pframe + WLAN_HDR_A3_LEN + _PROBEREQ_IE_OFFSET_, _SSID_IE_, (int *)&ielen, len - WLAN_HDR_A3_LEN - _PROBEREQ_IE_OFFSET_); - /* check (wildcard) SSID */ - if (p != NULL) - { + if (p != NULL) { if(is_valid_p2p_probereq == true) - { goto _issue_probersp; - } if ( (ielen != 0 && false ==_rtw_memcmp((void *)(p+2), (void *)cur->Ssid.Ssid, cur->Ssid.SsidLength)) || (ielen == 0 && pmlmeinfo->hidden_ssid_mode) ) - { return _SUCCESS; - } _issue_probersp: @@ -8394,30 +8359,6 @@ void site_survey(struct adapter *padapter) } } } -#ifdef CONFIG_ATMEL_RC_PATCH - #ifdef CONFIG_P2P - if( !rtw_p2p_chk_state(pwdinfo, P2P_STATE_SCAN) && - !rtw_p2p_chk_state(pwdinfo, P2P_STATE_FIND_PHASE_SEARCH) - ) - #endif/* CONFIG_P2P */ - { - if(ScanType == SCAN_ACTIVE){ - if( check_fwstate(pmlmepriv, _FW_LINKED) == true){ - if(survey_channel == pmlmeext->cur_channel ) - set_survey_timer(pmlmeext, 200); - else - set_survey_timer(pmlmeext, 20); - } - else{ - set_survey_timer(pmlmeext, 40); - } - } - else{/* SCAN_PASSIVE */ - set_survey_timer(pmlmeext, pmlmeext->chan_scan_time); - } - } - else -#endif /* CONFIG_ATMEL_RC_PATCH */ { #ifdef CONFIG_STA_MODE_SCAN_UNDER_AP_MODE if( stay_buddy_ch == 1 ) diff --git a/core/rtw_sta_mgt.c b/core/rtw_sta_mgt.c index 01a6b55..2fea7bb 100755 --- a/core/rtw_sta_mgt.c +++ b/core/rtw_sta_mgt.c @@ -153,18 +153,11 @@ u32 _rtw_init_sta_priv(struct sta_priv *pstapriv) pstapriv->expire_to = 3; /* 3*2 = 6 sec */ #else pstapriv->expire_to = 60;/* 60*2 = 120 sec = 2 min, expire after no any traffic. */ -#endif -#ifdef CONFIG_ATMEL_RC_PATCH - memset( pstapriv->atmel_rc_pattern, 0, ETH_ALEN); #endif pstapriv->max_num_sta = NUM_STA; - #endif -; - return _SUCCESS; - } inline int rtw_stainfo_offset(struct sta_priv *stapriv, struct sta_info *sta) @@ -421,9 +414,6 @@ struct sta_info *rtw_alloc_stainfo(struct sta_priv *pstapriv, u8 *hwaddr) /* init for DM */ psta->rssi_stat.UndecoratedSmoothedPWDB = (-1); psta->rssi_stat.UndecoratedSmoothedCCK = (-1); -#ifdef CONFIG_ATMEL_RC_PATCH - psta->flag_atmel_rc = 0; -#endif /* init for the sequence number of received management frame */ psta->RxMgmtFrameSeqNum = 0xffff; } @@ -576,9 +566,6 @@ u32 rtw_free_stainfo(struct adapter *padapter , struct sta_info *psta) _exit_critical_bh(&pstapriv->auth_list_lock, &irqL0); psta->expire_to = 0; -#ifdef CONFIG_ATMEL_RC_PATCH - psta->flag_atmel_rc = 0; -#endif psta->sleepq_ac_len = 0; psta->qos_info = 0; diff --git a/include/autoconf.h b/include/autoconf.h index 59531e5..02b339e 100755 --- a/include/autoconf.h +++ b/include/autoconf.h @@ -19,9 +19,6 @@ ******************************************************************************/ //***** temporarily flag ******* -//#define CONFIG_DISABLE_ODM -//#define CONFIG_ATMEL_RC_PATCH - #define CONFIG_ODM_REFRESH_RAMASK #define CONFIG_PHY_SETTING_WITH_ODM //for FPGA VERIFICATION config diff --git a/include/sta_info.h b/include/sta_info.h index 5b42034..bbd37d1 100755 --- a/include/sta_info.h +++ b/include/sta_info.h @@ -220,10 +220,6 @@ struct sta_info { u8 no_ht_set; u8 ht_20mhz_set; -#ifdef CONFIG_ATMEL_RC_PATCH - u8 flag_atmel_rc; -#endif - unsigned int tx_ra_bitmap; u8 qos_info; @@ -430,14 +426,8 @@ struct sta_priv { struct wlan_acl_pool acl_list; #endif - -#ifdef CONFIG_ATMEL_RC_PATCH - u8 atmel_rc_pattern [6]; -#endif - }; - __inline static u32 wifi_mac_hash(u8 *mac) { u32 x;