From 043ad6b1c112b176b996508988d137493da2f105 Mon Sep 17 00:00:00 2001 From: Emanuel Bennici Date: Sun, 17 Mar 2019 19:31:13 +0100 Subject: [PATCH] staging: rtl8723bs: Remove Dead Code in core/rtw_mlme.c The Functions `void rtw_surveydone_event_callback`, `void rtw_indicate_connect`, `void rtw_stadel_event_callback` and `void _rtw_join_timeout_handler` are using the Macro CONFIG_INTEL_WIDI which doesn't exists anymore. Signed-off-by: Emanuel Bennici Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8723bs/core/rtw_mlme.c | 32 ------------------------------- 1 file changed, 32 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rtl8723bs/core/rtw_mlme.c index 406e313..79adc6f 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c @@ -943,13 +943,6 @@ void rtw_surveydone_event_callback(struct adapter *adapter, u8 *pbuf) || _SUCCESS != rtw_sitesurvey_cmd(adapter, &pmlmepriv->assoc_ssid, 1, NULL, 0) ) { rtw_set_to_roam(adapter, 0); -#ifdef CONFIG_INTEL_WIDI - if (adapter->mlmepriv.widi_state == INTEL_WIDI_STATE_ROAMING) { - memset(pmlmepriv->sa_ext, 0x00, L2SDTA_SERVICE_VE_LEN); - intel_widi_wk_cmd(adapter, INTEL_WIDI_LISTEN_WK, NULL, 0); - DBG_871X("change to widi listen\n"); - } -#endif /* CONFIG_INTEL_WIDI */ rtw_free_assoc_resources(adapter, 1); rtw_indicate_disconnect(adapter); } else { @@ -1108,14 +1101,6 @@ void rtw_indicate_connect(struct adapter *padapter) } rtw_set_to_roam(padapter, 0); -#ifdef CONFIG_INTEL_WIDI - if (padapter->mlmepriv.widi_state == INTEL_WIDI_STATE_ROAMING) { - memset(pmlmepriv->sa_ext, 0x00, L2SDTA_SERVICE_VE_LEN); - intel_widi_wk_cmd(padapter, INTEL_WIDI_LISTEN_WK, NULL, 0); - DBG_871X("change to widi listen\n"); - } -#endif /* CONFIG_INTEL_WIDI */ - rtw_set_scan_deny(padapter, 3000); RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, ("-rtw_indicate_connect: fw_state = 0x%08x\n", get_fwstate(pmlmepriv))); @@ -1703,11 +1688,6 @@ void rtw_stadel_event_callback(struct adapter *adapter, u8 *pbuf) roam = true; roam_target = pmlmepriv->roam_network; } -#ifdef CONFIG_INTEL_WIDI - else if (adapter->mlmepriv.widi_state == INTEL_WIDI_STATE_CONNECTED) { - roam = true; - } -#endif /* CONFIG_INTEL_WIDI */ if (roam == true) { if (rtw_to_roam(adapter) > 0) @@ -1732,11 +1712,6 @@ void rtw_stadel_event_callback(struct adapter *adapter, u8 *pbuf) } spin_unlock_bh(&(pmlmepriv->scanned_queue.lock)); -#ifdef CONFIG_INTEL_WIDI - if (!rtw_to_roam(adapter)) - process_intel_widi_disconnect(adapter, 1); -#endif /* CONFIG_INTEL_WIDI */ - _rtw_roaming(adapter, roam_target); } @@ -1833,13 +1808,6 @@ void _rtw_join_timeout_handler(struct timer_list *t) } break; } else { -#ifdef CONFIG_INTEL_WIDI - if (adapter->mlmepriv.widi_state == INTEL_WIDI_STATE_ROAMING) { - memset(pmlmepriv->sa_ext, 0x00, L2SDTA_SERVICE_VE_LEN); - intel_widi_wk_cmd(adapter, INTEL_WIDI_LISTEN_WK, NULL, 0); - DBG_871X("change to widi listen\n"); - } -#endif /* CONFIG_INTEL_WIDI */ DBG_871X("%s We've try roaming but fail\n", __func__); rtw_indicate_disconnect(adapter); break; -- 2.7.4