Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e280d71b authored by Geliang Tang's avatar Geliang Tang Committed by Greg Kroah-Hartman
Browse files

staging: rtl8723au: use list_for_each_entry*() 



Use list_for_each_entry*() instead of list_for_each*() to simplify
the code.

Signed-off-by: default avatarGeliang Tang <geliangtang@163.com>
Acked-by: default avatarJes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 338e4716

drivers/staging/rtl8723au/core/rtw_ap.c

+23 −36
Original line number Diff line number Diff line
@@ -173,9 +173,9 @@ static u8 chk_sta_is_alive(struct sta_info *psta) 


void	expire_timeout_chk23a(struct rtw_adapter *padapter)

{

	struct list_head *phead, *plist, *ptmp;

	struct list_head *phead;

	u8 updated = 0;

	struct sta_info *psta;

	struct sta_info *psta, *ptmp;

	struct sta_priv *pstapriv = &padapter->stapriv;

	u8 chk_alive_num = 0;

	struct sta_info *chk_alive_list[NUM_STA];
@@ -186,8 +186,7 @@ void expire_timeout_chk23a(struct rtw_adapter *padapter) 
	phead = &pstapriv->auth_list;



	/* check auth_queue */

	list_for_each_safe(plist, ptmp, phead) {

		psta = container_of(plist, struct sta_info, auth_list);

	list_for_each_entry_safe(psta, ptmp, phead, auth_list) {



		if (psta->expire_to > 0) {

			psta->expire_to--;
@@ -216,8 +215,7 @@ void expire_timeout_chk23a(struct rtw_adapter *padapter) 
	phead = &pstapriv->asoc_list;



	/* check asoc_queue */

	list_for_each_safe(plist, ptmp, phead) {

		psta = container_of(plist, struct sta_info, asoc_list);

	list_for_each_entry_safe(psta, ptmp, phead, asoc_list) {



		if (chk_sta_is_alive(psta) || !psta->expire_to) {

			psta->expire_to = pstapriv->expire_to;
@@ -1059,7 +1057,7 @@ void rtw_set_macaddr_acl23a(struct rtw_adapter *padapter, int mode) 


int rtw_acl_add_sta23a(struct rtw_adapter *padapter, u8 *addr)

{

	struct list_head *plist, *phead;

	struct list_head *phead;

	u8 added = false;

	int i, ret = 0;

	struct rtw_wlan_acl_node *paclnode;
@@ -1076,8 +1074,7 @@ int rtw_acl_add_sta23a(struct rtw_adapter *padapter, u8 *addr) 


	phead = get_list_head(pacl_node_q);



	list_for_each(plist, phead) {

		paclnode = container_of(plist, struct rtw_wlan_acl_node, list);

	list_for_each_entry(paclnode, phead, list) {



		if (!memcmp(paclnode->addr, addr, ETH_ALEN)) {

			if (paclnode->valid == true) {
@@ -1121,8 +1118,8 @@ int rtw_acl_add_sta23a(struct rtw_adapter *padapter, u8 *addr) 


int rtw_acl_remove_sta23a(struct rtw_adapter *padapter, u8 *addr)

{

	struct list_head *plist, *phead, *ptmp;

	struct rtw_wlan_acl_node *paclnode;

	struct list_head *phead;

	struct rtw_wlan_acl_node *paclnode, *ptmp;

	struct sta_priv *pstapriv = &padapter->stapriv;

	struct wlan_acl_pool *pacl_list = &pstapriv->acl_list;

	struct rtw_queue *pacl_node_q = &pacl_list->acl_node_q;
@@ -1133,8 +1130,7 @@ int rtw_acl_remove_sta23a(struct rtw_adapter *padapter, u8 *addr) 


	phead = get_list_head(pacl_node_q);



	list_for_each_safe(plist, ptmp, phead) {

		paclnode = container_of(plist, struct rtw_wlan_acl_node, list);

	list_for_each_entry_safe(paclnode, ptmp, phead, list) {



		if (!memcmp(paclnode->addr, addr, ETH_ALEN)) {

			if (paclnode->valid) {
@@ -1354,19 +1350,16 @@ void associated_clients_update23a(struct rtw_adapter *padapter, u8 updated) 
{

	/* update associated stations cap. */

	if (updated == true) {

		struct list_head *phead, *plist, *ptmp;

		struct sta_info *psta;

		struct list_head *phead;

		struct sta_info *psta, *ptmp;

		struct sta_priv *pstapriv = &padapter->stapriv;



		spin_lock_bh(&pstapriv->asoc_list_lock);



		phead = &pstapriv->asoc_list;



		list_for_each_safe(plist, ptmp, phead) {

			psta = container_of(plist, struct sta_info, asoc_list);



		list_for_each_entry_safe(psta, ptmp, phead, asoc_list)

			VCS_update23a(padapter, psta);

		}



		spin_unlock_bh(&pstapriv->asoc_list_lock);

	}
@@ -1627,7 +1620,7 @@ u8 ap_free_sta23a(struct rtw_adapter *padapter, struct sta_info *psta, bool acti 


int rtw_ap_inform_ch_switch23a(struct rtw_adapter *padapter, u8 new_ch, u8 ch_offset)

{

	struct list_head *phead, *plist;

	struct list_head *phead;

	struct sta_info *psta = NULL;

	struct sta_priv *pstapriv = &padapter->stapriv;

	struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
@@ -1643,8 +1636,7 @@ int rtw_ap_inform_ch_switch23a(struct rtw_adapter *padapter, u8 new_ch, u8 ch_of 
	spin_lock_bh(&pstapriv->asoc_list_lock);

	phead = &pstapriv->asoc_list;



	list_for_each(plist, phead) {

		psta = container_of(plist, struct sta_info, asoc_list);

	list_for_each_entry(psta, phead, asoc_list) {



		issue_action_spct_ch_switch23a(padapter, psta->hwaddr, new_ch, ch_offset);

		psta->expire_to = ((pstapriv->expire_to * 2) > 5) ? 5 : (pstapriv->expire_to * 2);
@@ -1658,8 +1650,8 @@ int rtw_ap_inform_ch_switch23a(struct rtw_adapter *padapter, u8 new_ch, u8 ch_of 


int rtw_sta_flush23a(struct rtw_adapter *padapter)

{

	struct list_head *phead, *plist, *ptmp;

	struct sta_info *psta;

	struct list_head *phead;

	struct sta_info *psta, *ptmp;

	struct sta_priv *pstapriv = &padapter->stapriv;

	struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;

	struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;
@@ -1676,8 +1668,7 @@ int rtw_sta_flush23a(struct rtw_adapter *padapter) 
	spin_lock_bh(&pstapriv->asoc_list_lock);

	phead = &pstapriv->asoc_list;



	list_for_each_safe(plist, ptmp, phead) {

		psta = container_of(plist, struct sta_info, asoc_list);

	list_for_each_entry_safe(psta, ptmp, phead, asoc_list) {



		/* Remove sta from asoc_list */

		list_del_init(&psta->asoc_list);
@@ -1744,9 +1735,9 @@ void rtw_ap_restore_network(struct rtw_adapter *padapter) 
	struct mlme_priv *mlmepriv = &padapter->mlmepriv;

	struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;

	struct sta_priv *pstapriv = &padapter->stapriv;

	struct sta_info *psta;

	struct sta_info *psta, *ptmp;

	struct security_priv *psecuritypriv = &padapter->securitypriv;

	struct list_head *phead, *plist, *ptmp;

	struct list_head *phead;

	u8 chk_alive_num = 0;

	struct sta_info *chk_alive_list[NUM_STA];

	int i;
@@ -1778,11 +1769,8 @@ void rtw_ap_restore_network(struct rtw_adapter *padapter) 


	phead = &pstapriv->asoc_list;



	list_for_each_safe(plist, ptmp, phead) {

		psta = container_of(plist, struct sta_info, asoc_list);



	list_for_each_entry_safe(psta, ptmp, phead, asoc_list)

		chk_alive_list[chk_alive_num++] = psta;

	}



	spin_unlock_bh(&pstapriv->asoc_list_lock);
@@ -1841,8 +1829,8 @@ void start_ap_mode23a(struct rtw_adapter *padapter) 


void stop_ap_mode23a(struct rtw_adapter *padapter)

{

	struct list_head *phead, *plist, *ptmp;

	struct rtw_wlan_acl_node *paclnode;

	struct list_head *phead;

	struct rtw_wlan_acl_node *paclnode, *ptmp;

	struct sta_info *psta = NULL;

	struct sta_priv *pstapriv = &padapter->stapriv;

	struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
@@ -1865,8 +1853,7 @@ void stop_ap_mode23a(struct rtw_adapter *padapter) 
	spin_lock_bh(&pacl_node_q->lock);

	phead = get_list_head(pacl_node_q);



	list_for_each_safe(plist, ptmp, phead) {

		paclnode = container_of(plist, struct rtw_wlan_acl_node, list);

	list_for_each_entry_safe(paclnode, ptmp, phead, list) {



		if (paclnode->valid == true) {

			paclnode->valid = false;

drivers/staging/rtl8723au/core/rtw_mlme.c

+11 −17
Original line number Diff line number Diff line
@@ -171,8 +171,8 @@ rtw_find_network23a(struct rtw_queue *scanned_queue, u8 *addr) 


void rtw_free_network_queue23a(struct rtw_adapter *padapter)

{

	struct list_head *phead, *plist, *ptmp;

	struct wlan_network *pnetwork;

	struct list_head *phead;

	struct wlan_network *pnetwork, *ptmp;

	struct mlme_priv *pmlmepriv = &padapter->mlmepriv;

	struct rtw_queue *scanned_queue = &pmlmepriv->scanned_queue;
@@ -180,11 +180,8 @@ void rtw_free_network_queue23a(struct rtw_adapter *padapter) 


	phead = get_list_head(scanned_queue);



	list_for_each_safe(plist, ptmp, phead) {

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



	list_for_each_entry_safe(pnetwork, ptmp, phead, list)

		_rtw_free_network23a(pmlmepriv, pnetwork);

	}



	spin_unlock_bh(&scanned_queue->lock);

}
@@ -329,14 +326,13 @@ int is_same_network23a(struct wlan_bssid_ex *src, struct wlan_bssid_ex *dst) 
struct wlan_network *

rtw_get_oldest_wlan_network23a(struct rtw_queue *scanned_queue)

{

	struct list_head *plist, *phead;

	struct list_head *phead;

	struct wlan_network *pwlan;

	struct wlan_network *oldest = NULL;



	phead = get_list_head(scanned_queue);



	list_for_each(plist, phead) {

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

	list_for_each_entry(pwlan, phead, list) {



		if (pwlan->fixed != true) {

			if (!oldest || time_after(oldest->last_scanned,
@@ -710,17 +706,16 @@ rtw_surveydone_event_callback23a(struct rtw_adapter *adapter, const u8 *pbuf) 


static void free_scanqueue(struct mlme_priv *pmlmepriv)

{

	struct wlan_network *pnetwork;

	struct wlan_network *pnetwork, *ptemp;

	struct rtw_queue *scan_queue = &pmlmepriv->scanned_queue;

	struct list_head *plist, *phead, *ptemp;

	struct list_head *phead;



	RT_TRACE(_module_rtl871x_mlme_c_, _drv_notice_, "+free_scanqueue\n");

	spin_lock_bh(&scan_queue->lock);



	phead = get_list_head(scan_queue);



	list_for_each_safe(plist, ptemp, phead) {

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

	list_for_each_entry_safe(pnetwork, ptemp, phead, list) {

		pnetwork->fixed = false;

		_rtw_free_network23a(pmlmepriv, pnetwork);

	}
@@ -1625,15 +1620,14 @@ static int rtw_do_join(struct rtw_adapter *padapter) 
static struct wlan_network *

rtw_select_candidate_from_queue(struct mlme_priv *pmlmepriv)

{

	struct wlan_network *pnetwork, *candidate = NULL;

	struct wlan_network *pnetwork, *ptmp, *candidate = NULL;

	struct rtw_queue *queue = &pmlmepriv->scanned_queue;

	struct list_head *phead, *plist, *ptmp;

	struct list_head *phead;



	spin_lock_bh(&pmlmepriv->scanned_queue.lock);

	phead = get_list_head(queue);



	list_for_each_safe(plist, ptmp, phead) {

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

	list_for_each_entry_safe(pnetwork, ptmp, phead, list) {

		if (!pnetwork) {

			RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_,

				 "%s: return _FAIL:(pnetwork == NULL)\n",

drivers/staging/rtl8723au/core/rtw_mlme_ext.c

+4 −6
Original line number Diff line number Diff line
@@ -6061,8 +6061,8 @@ int tx_beacon_hdl23a(struct rtw_adapter *padapter, const u8 *pbuf) 
#ifdef CONFIG_8723AU_AP_MODE

	else { /* tx bc/mc frames after update TIM */

		struct sta_info *psta_bmc;

		struct list_head *plist, *phead, *ptmp;

		struct xmit_frame *pxmitframe;

		struct list_head *phead;

		struct xmit_frame *pxmitframe, *ptmp;

		struct xmit_priv *pxmitpriv = &padapter->xmitpriv;

		struct sta_priv  *pstapriv = &padapter->stapriv;
@@ -6078,10 +6078,8 @@ int tx_beacon_hdl23a(struct rtw_adapter *padapter, const u8 *pbuf) 


			phead = get_list_head(&psta_bmc->sleep_q);



			list_for_each_safe(plist, ptmp, phead) {

				pxmitframe = container_of(plist,

							  struct xmit_frame,

							  list);

			list_for_each_entry_safe(pxmitframe, ptmp,

						 phead, list) {



				list_del_init(&pxmitframe->list);

drivers/staging/rtl8723au/core/rtw_recv.c

+9 −13
Original line number Diff line number Diff line
@@ -88,13 +88,12 @@ int _rtw_init_recv_priv23a(struct recv_priv *precvpriv, 
void _rtw_free_recv_priv23a (struct recv_priv *precvpriv)

{

	struct rtw_adapter *padapter = precvpriv->adapter;

	struct recv_frame *precvframe;

	struct list_head *plist, *ptmp;

	struct recv_frame *precvframe, *ptmp;



	rtw_free_uc_swdec_pending_queue23a(padapter);



	list_for_each_safe(plist, ptmp, &precvpriv->free_recv_queue.queue) {

		precvframe = container_of(plist, struct recv_frame, list);

	list_for_each_entry_safe(precvframe, ptmp,

				 &precvpriv->free_recv_queue.queue, list) {

		list_del_init(&precvframe->list);

		kfree(precvframe);

	}
@@ -195,18 +194,16 @@ using spinlock to protect 


static void rtw_free_recvframe23a_queue(struct rtw_queue *pframequeue)

{

	struct recv_frame *hdr;

	struct list_head *plist, *phead, *ptmp;

	struct recv_frame *hdr, *ptmp;

	struct list_head *plist, *phead;



	spin_lock(&pframequeue->lock);



	phead = get_list_head(pframequeue);

	plist = phead->next;



	list_for_each_safe(plist, ptmp, phead) {

		hdr = container_of(plist, struct recv_frame, list);

	list_for_each_entry_safe(hdr, ptmp, phead, list)

		rtw_free_recvframe23a(hdr);

	}



	spin_unlock(&pframequeue->lock);

}
@@ -1549,10 +1546,10 @@ struct recv_frame *recvframe_defrag(struct rtw_adapter *adapter, 
struct recv_frame *recvframe_defrag(struct rtw_adapter *adapter,

				    struct rtw_queue *defrag_q)

{

	struct list_head *plist, *phead, *ptmp;

	struct list_head *plist, *phead;

	u8	*data, wlanhdr_offset;

	u8	curfragnum;

	struct recv_frame *pnfhdr;

	struct recv_frame *pnfhdr, *ptmp;

	struct recv_frame *prframe, *pnextrframe;

	struct rtw_queue	*pfree_recv_queue;

	struct sk_buff *skb;
@@ -1583,8 +1580,7 @@ struct recv_frame *recvframe_defrag(struct rtw_adapter *adapter, 


	data = prframe->pkt->data;



	list_for_each_safe(plist, ptmp, phead) {

		pnfhdr = container_of(plist, struct recv_frame, list);

	list_for_each_entry_safe(pnfhdr, ptmp, phead, list) {

		pnextrframe = (struct recv_frame *)pnfhdr;

		/* check the fragment sequence  (2nd ~n fragment frame) */

drivers/staging/rtl8723au/core/rtw_sta_mgt.c

+10 −15
Original line number Diff line number Diff line
@@ -83,8 +83,8 @@ int _rtw_init_sta_priv23a(struct sta_priv *pstapriv) 


int _rtw_free_sta_priv23a(struct sta_priv *pstapriv)

{

	struct list_head *phead, *plist, *ptmp;

	struct sta_info *psta;

	struct list_head *phead;

	struct sta_info *psta, *ptmp;

	struct recv_reorder_ctrl *preorder_ctrl;

	int index;
@@ -94,11 +94,9 @@ int _rtw_free_sta_priv23a(struct sta_priv *pstapriv) 
		for (index = 0; index < NUM_STA; index++) {

			phead = &pstapriv->sta_hash[index];



			list_for_each_safe(plist, ptmp, phead) {

			list_for_each_entry_safe(psta, ptmp, phead, hash_list) {

				int i;



				psta = container_of(plist, struct sta_info,

						    hash_list);

				for (i = 0; i < 16 ; i++) {

					preorder_ctrl = &psta->recvreorder_ctrl[i];

					del_timer_sync(&preorder_ctrl->reordering_ctrl_timer);
@@ -325,8 +323,8 @@ int rtw_free_stainfo23a(struct rtw_adapter *padapter, struct sta_info *psta) 
/*  free all stainfo which in sta_hash[all] */

void rtw_free_all_stainfo23a(struct rtw_adapter *padapter)

{

	struct list_head *plist, *phead, *ptmp;

	struct sta_info *psta;

	struct list_head *phead;

	struct sta_info *psta, *ptmp;

	struct sta_priv *pstapriv = &padapter->stapriv;

	struct sta_info *pbcmc_stainfo = rtw_get_bcmc_stainfo23a(padapter);

	s32 index;
@@ -339,8 +337,7 @@ void rtw_free_all_stainfo23a(struct rtw_adapter *padapter) 
	for (index = 0; index < NUM_STA; index++) {

		phead = &pstapriv->sta_hash[index];



		list_for_each_safe(plist, ptmp, phead) {

			psta = container_of(plist, struct sta_info, hash_list);

		list_for_each_entry_safe(psta, ptmp, phead, hash_list) {



			if (pbcmc_stainfo != psta)

				rtw_free_stainfo23a(padapter, psta);
@@ -352,7 +349,7 @@ void rtw_free_all_stainfo23a(struct rtw_adapter *padapter) 
/* any station allocated can be searched by hash list */

struct sta_info *rtw_get_stainfo23a(struct sta_priv *pstapriv, const u8 *hwaddr)

{

	struct list_head *plist, *phead;

	struct list_head *phead;

	struct sta_info *psta = NULL;

	u32	index;

	const u8 *addr;
@@ -371,8 +368,7 @@ struct sta_info *rtw_get_stainfo23a(struct sta_priv *pstapriv, const u8 *hwaddr) 


	phead = &pstapriv->sta_hash[index];



	list_for_each(plist, phead) {

		psta = container_of(plist, struct sta_info, hash_list);

	list_for_each_entry(psta, phead, hash_list) {



		/*  if found the matched address */

		if (ether_addr_equal(psta->hwaddr, addr))
@@ -418,7 +414,7 @@ bool rtw_access_ctrl23a(struct rtw_adapter *padapter, u8 *mac_addr) 
{

	bool res = true;

#ifdef CONFIG_8723AU_AP_MODE

	struct list_head *plist, *phead;

	struct list_head *phead;

	struct rtw_wlan_acl_node *paclnode;

	bool match = false;

	struct sta_priv *pstapriv = &padapter->stapriv;
@@ -428,8 +424,7 @@ bool rtw_access_ctrl23a(struct rtw_adapter *padapter, u8 *mac_addr) 
	spin_lock_bh(&pacl_node_q->lock);

	phead = get_list_head(pacl_node_q);



	list_for_each(plist, phead) {

		paclnode = container_of(plist, struct rtw_wlan_acl_node, list);

	list_for_each_entry(paclnode, phead, list) {



		if (ether_addr_equal(paclnode->addr, mac_addr)) {

			if (paclnode->valid) {