From 4808b0c71ef9af2165452c847a08164001acaaf3 Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Fri, 27 Feb 2015 15:34:48 -0600 Subject: [PATCH] rtl8188eu: Remove CONFIG_LAYER2_ROAMING_RESUME This symbol is always defined. Signed-off-by: Larry Finger --- include/autoconf.h | 1 - os_dep/os_intfs.c | 6 ------ os_dep/usb_intf.c | 2 -- 3 files changed, 9 deletions(-) diff --git a/include/autoconf.h b/include/autoconf.h index 8846da1..7b5b657 100755 --- a/include/autoconf.h +++ b/include/autoconf.h @@ -70,7 +70,6 @@ #define CONFIG_GLOBAL_UI_PID #define CONFIG_LAYER2_ROAMING -#define CONFIG_LAYER2_ROAMING_RESUME #define CONFIG_LONG_DELAY_ISSUE #define CONFIG_NEW_SIGNAL_STAT_PROCESS #define RTW_NOTCH_FILTER 0 /* 0:Disable, 1:Enable, */ diff --git a/os_dep/os_intfs.c b/os_dep/os_intfs.c index 953d6b4..41d7beb 100755 --- a/os_dep/os_intfs.c +++ b/os_dep/os_intfs.c @@ -1890,7 +1890,6 @@ static int rtw_suspend_free_assoc_resource(struct adapter *padapter) rtw_netif_stop_queue(pnetdev); } - #ifdef CONFIG_LAYER2_ROAMING_RESUME if(check_fwstate(pmlmepriv, WIFI_STATION_STATE) && check_fwstate(pmlmepriv, _FW_LINKED) && rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE)) { DBG_871X("%s %s(" MAC_FMT "), length:%d assoc_ssid.length:%d\n",__FUNCTION__, @@ -1900,7 +1899,6 @@ static int rtw_suspend_free_assoc_resource(struct adapter *padapter) pmlmepriv->assoc_ssid.SsidLength); rtw_set_roaming(padapter, 1); } - #endif /* CONFIG_LAYER2_ROAMING_RESUME */ if(check_fwstate(pmlmepriv, WIFI_STATION_STATE) && check_fwstate(pmlmepriv, _FW_LINKED)) { @@ -1976,11 +1974,7 @@ int rtw_resume_common(struct adapter *padapter) if (check_fwstate(mlmepriv, WIFI_STATION_STATE)) { DBG_871X(FUNC_ADPT_FMT" fwstate:0x%08x - WIFI_STATION_STATE\n", FUNC_ADPT_ARG(padapter), get_fwstate(mlmepriv)); - - #ifdef CONFIG_LAYER2_ROAMING_RESUME rtw_roaming(padapter, NULL); - #endif /* CONFIG_LAYER2_ROAMING_RESUME */ - } else if (check_fwstate(mlmepriv, WIFI_AP_STATE)) { DBG_871X(FUNC_ADPT_FMT" fwstate:0x%08x - WIFI_AP_STATE\n", FUNC_ADPT_ARG(padapter), get_fwstate(mlmepriv)); rtw_ap_restore_network(padapter); diff --git a/os_dep/usb_intf.c b/os_dep/usb_intf.c index 2af16c9..67c0cc3 100755 --- a/os_dep/usb_intf.c +++ b/os_dep/usb_intf.c @@ -705,7 +705,6 @@ static void rtw_suspend_wow(struct adapter *padapter) } -#ifdef CONFIG_LAYER2_ROAMING_RESUME if(check_fwstate(pmlmepriv, WIFI_STATION_STATE) && check_fwstate(pmlmepriv, _FW_LINKED)&& rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE)) { /* DBG_871X("%s:%d assoc_ssid:%s\n", __FUNCTION__, __LINE__, pmlmepriv->assoc_ssid.Ssid); */ @@ -717,7 +716,6 @@ static void rtw_suspend_wow(struct adapter *padapter) rtw_set_roaming(padapter, 1); } -#endif /* s2-2. indicate disconnect to os */ rtw_indicate_disconnect(padapter); /* s2-3. */