Commit 957ab09b authored by Vihas Makwana's avatar Vihas Makwana Committed by Greg Kroah-Hartman
Browse files

staging: r8188eu: drop unnecessary wrapper _rtw_alloc_network 



Drop unnecessary wrapper _rtw_alloc_network and move its logic to
rtw_alloc_network.

Reviewed-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarVihas Makwana <makvihas@gmail.com>
Link: https://lore.kernel.org/r/20220422193223.11948-7-makvihas@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 68df22cb

drivers/staging/r8188eu/core/rtw_cmd.c

+1 −1
Original line number Diff line number Diff line
@@ -1457,7 +1457,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) {

			pwlan = rtw_get_oldest_wlan_network(&pmlmepriv->scanned_queue);

drivers/staging/r8188eu/core/rtw_mlme.c

+25 −34
Original line number Diff line number Diff line
@@ -53,38 +53,6 @@ void rtw_free_mlme_priv_ie_data(struct mlme_priv *pmlmepriv) 
	rtw_free_mlme_ie_data(&pmlmepriv->p2p_assoc_req_ie, &pmlmepriv->p2p_assoc_req_ie_len);

}



struct	wlan_network *_rtw_alloc_network(struct	mlme_priv *pmlmepriv)/* _queue *free_queue) */

{

	struct	wlan_network	*pnetwork;

	struct __queue *free_queue = &pmlmepriv->free_bss_pool;

	struct list_head *plist = NULL;



	spin_lock_bh(&free_queue->lock);



	if (list_empty(&free_queue->queue)) {

		pnetwork = NULL;

		goto exit;

	}

	plist = (&free_queue->queue)->next;



	pnetwork = container_of(plist, struct wlan_network, list);



	list_del_init(&pnetwork->list);



	pnetwork->network_type = 0;

	pnetwork->fixed = false;

	pnetwork->last_scanned = jiffies;

	pnetwork->aid = 0;

	pnetwork->join_res = 0;



	pmlmepriv->num_of_scanned++;



exit:

	spin_unlock_bh(&free_queue->lock);



	return pnetwork;

}



void _rtw_free_network(struct mlme_priv *pmlmepriv, struct wlan_network *pnetwork, u8 isfreeall)

{

	u32 curr_time, delta_time;
@@ -285,11 +253,34 @@ void rtw_free_mlme_priv(struct mlme_priv *pmlmepriv) 
		vfree(pmlmepriv->free_bss_buf);

}



static struct wlan_network *rtw_alloc_network(struct mlme_priv *pmlmepriv)

struct wlan_network *rtw_alloc_network(struct mlme_priv *pmlmepriv)

{

	struct	wlan_network	*pnetwork;

	struct __queue *free_queue = &pmlmepriv->free_bss_pool;

	struct list_head *plist = NULL;



	spin_lock_bh(&free_queue->lock);



	pnetwork = _rtw_alloc_network(pmlmepriv);

	if (list_empty(&free_queue->queue)) {

		pnetwork = NULL;

		goto exit;

	}

	plist = (&free_queue->queue)->next;



	pnetwork = container_of(plist, struct wlan_network, list);



	list_del_init(&pnetwork->list);



	pnetwork->network_type = 0;

	pnetwork->fixed = false;

	pnetwork->last_scanned = jiffies;

	pnetwork->aid = 0;

	pnetwork->join_res = 0;



	pmlmepriv->num_of_scanned++;



exit:

	spin_unlock_bh(&free_queue->lock);



	return pnetwork;

}

drivers/staging/r8188eu/include/rtw_mlme.h

+1 −1
Original line number Diff line number Diff line
@@ -560,7 +560,7 @@ void rtw_scan_timeout_handler(struct adapter *adapter); 


void rtw_free_mlme_priv_ie_data(struct mlme_priv *pmlmepriv);



 struct wlan_network *_rtw_alloc_network(struct mlme_priv *pmlmepriv);

struct wlan_network *rtw_alloc_network(struct mlme_priv *pmlmepriv);



void _rtw_free_network(struct mlme_priv *pmlmepriv,

		       struct wlan_network *pnetwork, u8 isfreeall);