From 043ad6b1c112b176b996508988d137493da2f105 Mon Sep 17 00:00:00 2001 From: Emanuel Bennici Date: Sun, 17 Mar 2019 19:31:13 +0100 Subject: 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(-) (limited to 'drivers/staging/rtl8723bs/core/rtw_mlme.c') diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rtl8723bs/core/rtw_mlme.c index 406e313477aa..79adc6f1e53a 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; -- cgit v1.2.3-59-g8ed1b From cb8de77c78c73541edd32eeb62501af1bd73c76a Mon Sep 17 00:00:00 2001 From: Nishka Dasgupta Date: Fri, 22 Mar 2019 20:08:23 +0530 Subject: staging; rtl8723bs: Remove unnecessary function rtw_init_mlme_priv() Remove function rtw_init_mlme_priv() as all it does is call _rtw_init_mlme_priv(). Change the name of _rtw_init_mlme_priv() to rtw_init_mlme_priv() and its return type to int. Remove references to _rtw_init_mlme_priv() from the corresponding header file. Suggestion to delete return variable from rtw_init_mlme_priv() put forward by Coccinelle using ret.cocci. Signed-off-by: Nishka Dasgupta Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8723bs/core/rtw_mlme.c | 13 ++----------- drivers/staging/rtl8723bs/include/rtw_mlme.h | 2 -- 2 files changed, 2 insertions(+), 13 deletions(-) (limited to 'drivers/staging/rtl8723bs/core/rtw_mlme.c') diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rtl8723bs/core/rtw_mlme.c index 79adc6f1e53a..8f1defdd47f0 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c @@ -13,13 +13,13 @@ extern u8 rtw_do_join(struct adapter *padapter); -sint _rtw_init_mlme_priv(struct adapter *padapter) +int rtw_init_mlme_priv(struct adapter *padapter) { sint i; u8 *pbuf; struct wlan_network *pnetwork; struct mlme_priv *pmlmepriv = &padapter->mlmepriv; - sint res = _SUCCESS; + int res = _SUCCESS; pmlmepriv->nic_hdl = (u8 *)padapter; @@ -350,15 +350,6 @@ u8 *rtw_get_beacon_interval_from_ie(u8 *ie) return (ie + 8); } - -int rtw_init_mlme_priv(struct adapter *padapter)/* struct mlme_priv *pmlmepriv) */ -{ - int res; - - res = _rtw_init_mlme_priv(padapter);/* (pmlmepriv); */ - return res; -} - void rtw_free_mlme_priv(struct mlme_priv *pmlmepriv) { RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, ("rtw_free_mlme_priv\n")); diff --git a/drivers/staging/rtl8723bs/include/rtw_mlme.h b/drivers/staging/rtl8723bs/include/rtw_mlme.h index ed59f16c26c4..82f378c6789e 100644 --- a/drivers/staging/rtl8723bs/include/rtw_mlme.h +++ b/drivers/staging/rtl8723bs/include/rtw_mlme.h @@ -592,8 +592,6 @@ void rtw_clear_scan_deny(struct adapter *adapter); void rtw_set_scan_deny_timer_hdl(struct adapter *adapter); void rtw_set_scan_deny(struct adapter *adapter, u32 ms); -extern int _rtw_init_mlme_priv(struct adapter *padapter); - void rtw_free_mlme_priv_ie_data(struct mlme_priv *pmlmepriv); extern void _rtw_free_mlme_priv(struct mlme_priv *pmlmepriv); -- cgit v1.2.3-59-g8ed1b From 2c506ddfd51b884138ab999faf7516d8e2c3b788 Mon Sep 17 00:00:00 2001 From: Nishka Dasgupta Date: Fri, 22 Mar 2019 20:08:24 +0530 Subject: staging: rtl8723bs: core: Change datatype from sint to int Change datatype of local variable from sint to int. Signed-off-by: Nishka Dasgupta Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8723bs/core/rtw_mlme.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/staging/rtl8723bs/core/rtw_mlme.c') diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rtl8723bs/core/rtw_mlme.c index 8f1defdd47f0..599958819d2d 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c @@ -15,7 +15,7 @@ extern u8 rtw_do_join(struct adapter *padapter); int rtw_init_mlme_priv(struct adapter *padapter) { - sint i; + int i; u8 *pbuf; struct wlan_network *pnetwork; struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -- cgit v1.2.3-59-g8ed1b From 367cdd1305ac091813fe98342e868219d8146e5a Mon Sep 17 00:00:00 2001 From: Nishka Dasgupta Date: Fri, 22 Mar 2019 20:08:25 +0530 Subject: staging: rtl8723bs: core: Remove parentheses Remove unnecessary parentheses around variables. Issue found with Checkpatch. Signed-off-by: Nishka Dasgupta Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8723bs/core/rtw_mlme.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'drivers/staging/rtl8723bs/core/rtw_mlme.c') diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rtl8723bs/core/rtw_mlme.c index 599958819d2d..8b3a095f0c4c 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c @@ -29,9 +29,9 @@ int rtw_init_mlme_priv(struct adapter *padapter) pmlmepriv->cur_network.network.InfrastructureMode = Ndis802_11AutoUnknown; pmlmepriv->scan_mode = SCAN_ACTIVE;/* 1: active, 0: pasive. Maybe someday we should rename this varable to "active_mode" (Jeff) */ - spin_lock_init(&(pmlmepriv->lock)); - _rtw_init_queue(&(pmlmepriv->free_bss_pool)); - _rtw_init_queue(&(pmlmepriv->scanned_queue)); + spin_lock_init(&pmlmepriv->lock); + _rtw_init_queue(&pmlmepriv->free_bss_pool); + _rtw_init_queue(&pmlmepriv->scanned_queue); set_scanned_network_val(pmlmepriv, 0); @@ -48,9 +48,9 @@ int rtw_init_mlme_priv(struct adapter *padapter) pnetwork = (struct wlan_network *)pbuf; for (i = 0; i < MAX_BSS_CNT; i++) { - INIT_LIST_HEAD(&(pnetwork->list)); + INIT_LIST_HEAD(&pnetwork->list); - list_add_tail(&(pnetwork->list), &(pmlmepriv->free_bss_pool.queue)); + list_add_tail(&pnetwork->list, &pmlmepriv->free_bss_pool.queue); pnetwork++; } -- cgit v1.2.3-59-g8ed1b From 8e97f7d8662302643448f1af3ad7b0d2df91c537 Mon Sep 17 00:00:00 2001 From: Nishka Dasgupta Date: Fri, 22 Mar 2019 20:08:26 +0530 Subject: staging: rtl8723bs: Remove function rtw_alloc_network() Remove function rtw_alloc_network() as all it does is call _rtw_alloc_network(). Rename _rtw_alloc_network() to rtw_alloc_network(). Change references to _rtw_alloc_network() to refer to rtw_alloc_network(). Issue first noticed while using Coccinelle and ret.cocci. Signed-off-by: Nishka Dasgupta Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8723bs/core/rtw_cmd.c | 2 +- drivers/staging/rtl8723bs/core/rtw_mlme.c | 14 +++----------- drivers/staging/rtl8723bs/include/rtw_mlme.h | 2 +- 3 files changed, 5 insertions(+), 13 deletions(-) (limited to 'drivers/staging/rtl8723bs/core/rtw_mlme.c') diff --git a/drivers/staging/rtl8723bs/core/rtw_cmd.c b/drivers/staging/rtl8723bs/core/rtw_cmd.c index 04c6927dab8b..ecaa769f12e6 100644 --- a/drivers/staging/rtl8723bs/core/rtw_cmd.c +++ b/drivers/staging/rtl8723bs/core/rtw_cmd.c @@ -2100,7 +2100,7 @@ void rtw_createbss_cmd_callback(struct adapter *padapter, struct cmd_obj *pcmd) rtw_indicate_connect(padapter); } else { - pwlan = _rtw_alloc_network(pmlmepriv); + pwlan = rtw_alloc_network(pmlmepriv); spin_lock_bh(&(pmlmepriv->scanned_queue.lock)); if (pwlan == NULL) { pwlan = rtw_get_oldest_wlan_network(&pmlmepriv->scanned_queue); diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rtl8723bs/core/rtw_mlme.c index 8b3a095f0c4c..552df9e3cd14 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c @@ -143,7 +143,7 @@ struct wlan_network *_rtw_dequeue_network(struct __queue *queue) } */ -struct wlan_network *_rtw_alloc_network(struct mlme_priv *pmlmepriv)/* _queue *free_queue) */ +struct wlan_network *rtw_alloc_network(struct mlme_priv *pmlmepriv) { struct wlan_network *pnetwork; struct __queue *free_queue = &pmlmepriv->free_bss_pool; @@ -161,7 +161,8 @@ struct wlan_network *_rtw_alloc_network(struct mlme_priv *pmlmepriv)/* _queue *f list_del_init(&pnetwork->list); - RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, ("_rtw_alloc_network: ptr =%p\n", plist)); + RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, + ("rtw_alloc_network: ptr =%p\n", plist)); pnetwork->network_type = 0; pnetwork->fixed = false; pnetwork->last_scanned = jiffies; @@ -366,15 +367,6 @@ static struct wlan_network *rtw_dequeue_network(struct __queue *queue) } */ -struct wlan_network *rtw_alloc_network(struct mlme_priv *pmlmepriv); -struct wlan_network *rtw_alloc_network(struct mlme_priv *pmlmepriv)/* _queue *free_queue) */ -{ - struct wlan_network *pnetwork; - - pnetwork = _rtw_alloc_network(pmlmepriv); - return pnetwork; -} - void rtw_free_network_nolock(struct adapter *padapter, struct wlan_network *pnetwork); void rtw_free_network_nolock(struct adapter *padapter, struct wlan_network *pnetwork) { diff --git a/drivers/staging/rtl8723bs/include/rtw_mlme.h b/drivers/staging/rtl8723bs/include/rtw_mlme.h index 82f378c6789e..2693b554f414 100644 --- a/drivers/staging/rtl8723bs/include/rtw_mlme.h +++ b/drivers/staging/rtl8723bs/include/rtw_mlme.h @@ -598,7 +598,7 @@ extern void _rtw_free_mlme_priv(struct mlme_priv *pmlmepriv); /* extern struct wlan_network* _rtw_dequeue_network(struct __queue *queue); */ -extern struct wlan_network* _rtw_alloc_network(struct mlme_priv *pmlmepriv); +extern struct wlan_network *rtw_alloc_network(struct mlme_priv *pmlmepriv); extern void _rtw_free_network(struct mlme_priv *pmlmepriv, struct wlan_network *pnetwork, u8 isfreeall); -- cgit v1.2.3-59-g8ed1b From fbf99f66707c1a60db9e8e627f0a38809ea7b782 Mon Sep 17 00:00:00 2001 From: Payal Kshirsagar Date: Sat, 30 Mar 2019 10:42:44 +0530 Subject: staging: rtl8723bs: core: rtw_mlme.c: Remove unnecessary parentheses Challenge suggested by coccinelle. Remove unnecessary parentheses around expressions. Signed-off-by: Payal Kshirsagar Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8723bs/core/rtw_mlme.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'drivers/staging/rtl8723bs/core/rtw_mlme.c') diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rtl8723bs/core/rtw_mlme.c index 552df9e3cd14..5f78f1eaa7aa 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c @@ -333,7 +333,7 @@ void rtw_generate_random_ibss(u8 *pibss) u8 *rtw_get_capability_from_ie(u8 *ie) { - return (ie + 8 + 2); + return ie + 8 + 2; } @@ -348,7 +348,7 @@ u16 rtw_get_capability(struct wlan_bssid_ex *bss) u8 *rtw_get_beacon_interval_from_ie(u8 *ie) { - return (ie + 8); + return ie + 8; } void rtw_free_mlme_priv(struct mlme_priv *pmlmepriv) @@ -434,14 +434,14 @@ int is_same_network(struct wlan_bssid_ex *src, struct wlan_bssid_ex *dst, u8 fea s_cap = le16_to_cpu(tmps); d_cap = le16_to_cpu(tmpd); - return ((src->Ssid.SsidLength == dst->Ssid.SsidLength) && + return (src->Ssid.SsidLength == dst->Ssid.SsidLength) && /* (src->Configuration.DSConfig == dst->Configuration.DSConfig) && */ ((!memcmp(src->MacAddress, dst->MacAddress, ETH_ALEN))) && ((!memcmp(src->Ssid.Ssid, dst->Ssid.Ssid, src->Ssid.SsidLength))) && ((s_cap & WLAN_CAPABILITY_IBSS) == (d_cap & WLAN_CAPABILITY_IBSS)) && ((s_cap & WLAN_CAPABILITY_BSS) == - (d_cap & WLAN_CAPABILITY_BSS))); + (d_cap & WLAN_CAPABILITY_BSS)); } -- cgit v1.2.3-59-g8ed1b