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

rtl8188eu: Remove CONFIG_LAYER2_ROAMING

Browse source 
This symbol is always defined.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2015-02-27 15:46:32 -06:00
parent 4808b0c71e
commit 72bd29ec15
6 changed files with 4 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
core/rtw_mlme.c
View file

@ -1159,7 +1159,6 @@ void rtw_surveydone_event_callback(struct adapter *adapter, u8 *pbuf)
else
{
DBG_871X("try_to_join, but select scanning queue fail, to_roaming:%d\n", rtw_to_roaming(adapter));
#ifdef CONFIG_LAYER2_ROAMING
if (rtw_to_roaming(adapter) != 0) {
if( --pmlmepriv->to_roaming == 0
|| _SUCCESS != rtw_sitesurvey_cmd(adapter, &pmlmepriv->assoc_ssid, 1, NULL, 0)
@ -1178,10 +1177,7 @@ void rtw_surveydone_event_callback(struct adapter *adapter, u8 *pbuf)
} else {
pmlmepriv->to_join = true;
}
}
else
#endif
{
} else {
rtw_indicate_disconnect(adapter);
}
_clr_fwstate_(pmlmepriv, _FW_UNDER_LINKING);
@ -2063,7 +2059,6 @@ void rtw_stadel_event_callback(struct adapter *adapter, u8 *pbuf)
if(check_fwstate(pmlmepriv, WIFI_STATION_STATE) )
{
#ifdef CONFIG_LAYER2_ROAMING
if(adapter->registrypriv.wifi_spec==1)
rtw_set_roaming(adapter, 0); /* don't roam */
else if (rtw_to_roaming(adapter) > 0)
@ -2075,7 +2070,6 @@ void rtw_stadel_event_callback(struct adapter *adapter, u8 *pbuf)
#endif /* CONFIG_INTEL_WIDI */
if(*((unsigned short *)(pstadel->rsvd)) != WLAN_REASON_EXPIRATION_CHK)
rtw_set_roaming(adapter, 0); /* don't roam */
#endif
rtw_free_uc_swdec_pending_queue(adapter);
@ -2090,14 +2084,7 @@ void rtw_stadel_event_callback(struct adapter *adapter, u8 *pbuf)
}
_exit_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL);
#ifdef CONFIG_LAYER2_ROAMING
_rtw_roaming(adapter, tgt_network);
#else
#ifdef CONFIG_INTEL_WIDI
process_intel_widi_disconnect(adapter, 1);
#endif /* CONFIG_INTEL_WIDI */
#endif /* CONFIG_LAYER2_ROAMING */
}
if ( check_fwstate(pmlmepriv,WIFI_ADHOC_MASTER_STATE) ||
@ -2170,9 +2157,7 @@ void _rtw_join_timeout_handler (struct adapter *adapter)
{
_irqL irqL;
struct mlme_priv *pmlmepriv = &adapter->mlmepriv;
#ifdef CONFIG_LAYER2_ROAMING
int do_join_r;
#endif /* CONFIG_LAYER2_ROAMING */
;
DBG_871X("%s, fw_state=%x\n", __FUNCTION__, get_fwstate(pmlmepriv));
@ -2183,7 +2168,6 @@ void _rtw_join_timeout_handler (struct adapter *adapter)
_enter_critical_bh(&pmlmepriv->lock, &irqL);
#ifdef CONFIG_LAYER2_ROAMING
if (rtw_to_roaming(adapter) > 0) { /* join timeout caused by roaming */
while(1) {
pmlmepriv->to_roaming--;
@ -2208,10 +2192,7 @@ void _rtw_join_timeout_handler (struct adapter *adapter)
break;
}
}
} else
#endif
{
} else {
rtw_indicate_disconnect(adapter);
free_scanqueue(pmlmepriv);/* */
@ -2415,14 +2396,12 @@ static int rtw_check_join_candidate(struct mlme_priv *pmlmepriv
if(rtw_is_desired_network(adapter, competitor) == false)
goto exit;
#ifdef CONFIG_LAYER2_ROAMING
if(rtw_to_roaming(adapter) > 0) {
if( rtw_get_passing_time_ms((u32)competitor->last_scanned) >= RTW_SCAN_RESULT_EXPIRE
|| is_same_ess(&competitor->network, &pmlmepriv->cur_network.network) == false
)
goto exit;
}
#endif
if(*candidate == NULL ||(*candidate)->network.Rssi<competitor->network.Rssi )
{
@ -2431,7 +2410,6 @@ static int rtw_check_join_candidate(struct mlme_priv *pmlmepriv
}
if(updated){
#ifdef CONFIG_LAYER2_ROAMING
DBG_871X("[by_bssid:%u][assoc_ssid:%s]"
"[to_roaming:%u] "
"new candidate: %s("MAC_FMT") rssi:%d\n",
@ -2442,16 +2420,6 @@ static int rtw_check_join_candidate(struct mlme_priv *pmlmepriv
MAC_ARG((*candidate)->network.MacAddress),
(int)(*candidate)->network.Rssi
);
#else
DBG_871X("[by_bssid:%u][assoc_ssid:%s]"
"new candidate: %s("MAC_FMT") rssi:%d\n",
pmlmepriv->assoc_by_bssid,
pmlmepriv->assoc_ssid.Ssid,
(*candidate)->network.Ssid.Ssid,
MAC_ARG((*candidate)->network.MacAddress),
(int)(*candidate)->network.Rssi
);
#endif
}
exit:
@ -3243,7 +3211,6 @@ void rtw_issue_addbareq_cmd(struct adapter *padapter, struct xmit_frame *pxmitfr
}
#ifdef CONFIG_LAYER2_ROAMING
inline void rtw_set_roaming(struct adapter *adapter, u8 to_roaming)
{
if (to_roaming == 0)
@ -3308,7 +3275,6 @@ void _rtw_roaming(struct adapter *padapter, struct wlan_network *tgt_network)
}
}
#endif
sint rtw_linked_check(struct adapter *padapter)
{

1
include/autoconf.h
View file

@ -69,7 +69,6 @@
#define USB_INTERFERENCE_ISSUE // this should be checked in all usb interface
#define CONFIG_GLOBAL_UI_PID
#define CONFIG_LAYER2_ROAMING
#define CONFIG_LONG_DELAY_ISSUE
#define CONFIG_NEW_SIGNAL_STAT_PROCESS
#define RTW_NOTCH_FILTER 0 /* 0:Disable, 1:Enable, */

2
include/drv_types.h
View file

@ -175,9 +175,7 @@ struct registry_priv
char adaptor_info_caching_file_path[PATH_LENGTH_MAX];
#endif
#ifdef CONFIG_LAYER2_ROAMING
u8 max_roaming_times; // the max number driver will try to roaming
#endif
#ifdef CONFIG_IOL
u8 fw_iol; //enable iol without other concern

10
include/rtw_mlme.h
View file

@ -387,9 +387,7 @@ struct mlme_priv {
sint fw_state; //shall we protect this variable? maybe not necessarily...
u8 bScanInProcess;
u8 to_join; //flag
#ifdef CONFIG_LAYER2_ROAMING
u8 to_roaming; // roaming trying times
#endif
u8 *nic_hdl;
@ -775,17 +773,10 @@ void rtw_issue_addbareq_cmd(struct adapter *padapter, struct xmit_frame *pxmitfr
int rtw_is_same_ibss(struct adapter *adapter, struct wlan_network *pnetwork);
int is_same_network(WLAN_BSSID_EX *src, WLAN_BSSID_EX *dst, u8 feature);
#ifdef CONFIG_LAYER2_ROAMING
void _rtw_roaming(struct adapter *adapter, struct wlan_network *tgt_network);
void rtw_roaming(struct adapter *adapter, struct wlan_network *tgt_network);
void rtw_set_roaming(struct adapter *adapter, u8 to_roaming);
u8 rtw_to_roaming(struct adapter *adapter);
#else
#define _rtw_roaming(adapter, tgt_network) do {} while(0)
#define rtw_roaming(adapter, tgt_network) do {} while(0)
#define rtw_set_roaming(adapter, to_roaming) do {} while(0)
#define rtw_to_roaming(adapter) 0
#endif
void rtw_sta_media_status_rpt(struct adapter *adapter,struct sta_info *psta, u32 mstatus);
@ -794,4 +785,5 @@ void rtw_proxim_enable(struct adapter *padapter);
void rtw_proxim_disable(struct adapter *padapter);
void rtw_proxim_send_packet(struct adapter *padapter,u8 *pbuf,u16 len,u8 hw_rate);
#endif //CONFIG_INTEL_PROXIM
#endif //__RTL871X_MLME_H_

6
os_dep/ioctl_cfg80211.c
View file

@ -697,7 +697,6 @@ check_bss:
if (!rtw_cfg80211_check_bss(padapter))
DBG_871X_LEVEL(_drv_always_, FUNC_ADPT_FMT" BSS not found !!\n", FUNC_ADPT_ARG(padapter));
#ifdef CONFIG_LAYER2_ROAMING
if (rtw_to_roaming(padapter) > 0) {
#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 39) || defined(COMPAT_KERNEL_RELEASE)
struct wiphy *wiphy = pwdev->wiphy;
@ -724,10 +723,7 @@ check_bss:
, pmlmepriv->assoc_rsp+sizeof(struct rtw_ieee80211_hdr_3addr)+6
, pmlmepriv->assoc_rsp_len-sizeof(struct rtw_ieee80211_hdr_3addr)-6
, GFP_ATOMIC);
}
else
#endif
{
} else {
cfg80211_connect_result(padapter->pnetdev, cur_network->network.MacAddress
, pmlmepriv->assoc_req+sizeof(struct rtw_ieee80211_hdr_3addr)+2
, pmlmepriv->assoc_req_len-sizeof(struct rtw_ieee80211_hdr_3addr)-2

6
os_dep/os_intfs.c
View file

@ -234,11 +234,9 @@ module_param(rtw_adaptor_info_caching_file_path, charp, 0644);
MODULE_PARM_DESC(rtw_adaptor_info_caching_file_path, "The path of adapter info cache file");
#endif /* CONFIG_ADAPTOR_INFO_CACHING_FILE */
#ifdef CONFIG_LAYER2_ROAMING
static uint rtw_max_roaming_times=2;
module_param(rtw_max_roaming_times, uint, 0644);
MODULE_PARM_DESC(rtw_max_roaming_times,"The max roaming times to try");
#endif /* CONFIG_LAYER2_ROAMING */
#ifdef CONFIG_IOL
static int rtw_fw_iol=1;/* 0:Disable, 1:enable, 2:by usb speed */
@ -300,8 +298,6 @@ static uint loadparam( struct adapter *padapter, _nic_hdl pnetdev)
uint status = _SUCCESS;
struct registry_priv *registry_par = &padapter->registrypriv;
;
GlobalDebugLevel = rtw_debug;
registry_par->chip_version = (u8)rtw_chip_version;
registry_par->rfintfs = (u8)rtw_rfintfs;
@ -389,12 +385,10 @@ static uint loadparam( struct adapter *padapter, _nic_hdl pnetdev)
registry_par->adaptor_info_caching_file_path[PATH_LENGTH_MAX-1]=0;
#endif
#ifdef CONFIG_LAYER2_ROAMING
registry_par->max_roaming_times = (u8)rtw_max_roaming_times;
#ifdef CONFIG_INTEL_WIDI
registry_par->max_roaming_times = (u8)rtw_max_roaming_times + 2;
#endif /* CONFIG_INTEL_WIDI */
#endif
#ifdef CONFIG_IOL
registry_par->fw_iol = rtw_fw_iol;