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

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

staging: rtl8723au: whitespace and blank line cleaning 



This patch cleans whitespaces and blank lines involved with
previous two patchs in this patch set.

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 703a7604

drivers/staging/rtl8723au/core/rtw_ap.c

+1 −32
Original line number Original line Diff line number Diff line
@@ -182,12 +182,9 @@ void expire_timeout_chk23a(struct rtw_adapter *padapter) 
	int i;

	int i;





	spin_lock_bh(&pstapriv->auth_list_lock);

	spin_lock_bh(&pstapriv->auth_list_lock);



	phead = &pstapriv->auth_list;

	phead = &pstapriv->auth_list;



	/* check auth_queue */

	/* check auth_queue */

	list_for_each_entry_safe(psta, ptmp, phead, auth_list) {

	list_for_each_entry_safe(psta, ptmp, phead, auth_list) {



		if (psta->expire_to > 0) {

		if (psta->expire_to > 0) {

			psta->expire_to--;

			psta->expire_to--;

			if (psta->expire_to == 0) {

			if (psta->expire_to == 0) {
@@ -205,18 +202,13 @@ void expire_timeout_chk23a(struct rtw_adapter *padapter) 
				spin_lock_bh(&pstapriv->auth_list_lock);

				spin_lock_bh(&pstapriv->auth_list_lock);

			}

			}

		}

		}



	}

	}



	spin_unlock_bh(&pstapriv->auth_list_lock);

	spin_unlock_bh(&pstapriv->auth_list_lock);





	spin_lock_bh(&pstapriv->asoc_list_lock);

	spin_lock_bh(&pstapriv->asoc_list_lock);



	phead = &pstapriv->asoc_list;

	phead = &pstapriv->asoc_list;



	/* check asoc_queue */

	/* check asoc_queue */

	list_for_each_entry_safe(psta, ptmp, phead, asoc_list) {

	list_for_each_entry_safe(psta, ptmp, phead, asoc_list) {



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

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

			psta->expire_to = pstapriv->expire_to;

			psta->expire_to = pstapriv->expire_to;

			psta->keep_alive_trycnt = 0;

			psta->keep_alive_trycnt = 0;
@@ -281,7 +273,6 @@ void expire_timeout_chk23a(struct rtw_adapter *padapter) 
			}

			}

		}

		}

	}

	}



	spin_unlock_bh(&pstapriv->asoc_list_lock);

	spin_unlock_bh(&pstapriv->asoc_list_lock);





	if (chk_alive_num) {

	if (chk_alive_num) {
@@ -1071,11 +1062,8 @@ int rtw_acl_add_sta23a(struct rtw_adapter *padapter, u8 *addr) 
		return -1;

		return -1;





	spin_lock_bh(&pacl_node_q->lock);

	spin_lock_bh(&pacl_node_q->lock);



	phead = get_list_head(pacl_node_q);

	phead = get_list_head(pacl_node_q);



	list_for_each_entry(paclnode, phead, list) {

	list_for_each_entry(paclnode, phead, list) {



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

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

			if (paclnode->valid == true) {

			if (paclnode->valid == true) {

				added = true;

				added = true;
@@ -1084,7 +1072,6 @@ int rtw_acl_add_sta23a(struct rtw_adapter *padapter, u8 *addr) 
			}

			}

		}

		}

	}

	}



	spin_unlock_bh(&pacl_node_q->lock);

	spin_unlock_bh(&pacl_node_q->lock);





	if (added)

	if (added)
@@ -1127,11 +1114,8 @@ int rtw_acl_remove_sta23a(struct rtw_adapter *padapter, u8 *addr) 
	DBG_8723A("%s(acl_num =%d) = %pM\n", __func__, pacl_list->num, addr);

	DBG_8723A("%s(acl_num =%d) = %pM\n", __func__, pacl_list->num, addr);





	spin_lock_bh(&pacl_node_q->lock);

	spin_lock_bh(&pacl_node_q->lock);



	phead = get_list_head(pacl_node_q);

	phead = get_list_head(pacl_node_q);



	list_for_each_entry_safe(paclnode, ptmp, phead, list) {

	list_for_each_entry_safe(paclnode, ptmp, phead, list) {



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

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

			if (paclnode->valid) {

			if (paclnode->valid) {

				paclnode->valid = false;

				paclnode->valid = false;
@@ -1142,7 +1126,6 @@ int rtw_acl_remove_sta23a(struct rtw_adapter *padapter, u8 *addr) 
			}

			}

		}

		}

	}

	}



	spin_unlock_bh(&pacl_node_q->lock);

	spin_unlock_bh(&pacl_node_q->lock);





	DBG_8723A("%s, acl_num =%d\n", __func__, pacl_list->num);

	DBG_8723A("%s, acl_num =%d\n", __func__, pacl_list->num);
@@ -1355,12 +1338,9 @@ void associated_clients_update23a(struct rtw_adapter *padapter, u8 updated) 
		struct sta_priv *pstapriv = &padapter->stapriv;

		struct sta_priv *pstapriv = &padapter->stapriv;





		spin_lock_bh(&pstapriv->asoc_list_lock);

		spin_lock_bh(&pstapriv->asoc_list_lock);



		phead = &pstapriv->asoc_list;

		phead = &pstapriv->asoc_list;



		list_for_each_entry_safe(psta, ptmp, phead, asoc_list)

		list_for_each_entry_safe(psta, ptmp, phead, asoc_list)

			VCS_update23a(padapter, psta);

			VCS_update23a(padapter, psta);



		spin_unlock_bh(&pstapriv->asoc_list_lock);

		spin_unlock_bh(&pstapriv->asoc_list_lock);

	}

	}

}

}
@@ -1635,9 +1615,7 @@ int rtw_ap_inform_ch_switch23a(struct rtw_adapter *padapter, u8 new_ch, u8 ch_of 




	spin_lock_bh(&pstapriv->asoc_list_lock);

	spin_lock_bh(&pstapriv->asoc_list_lock);

	phead = &pstapriv->asoc_list;

	phead = &pstapriv->asoc_list;



	list_for_each_entry(psta, phead, asoc_list) {

	list_for_each_entry(psta, phead, asoc_list) {



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

		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);

		psta->expire_to = ((pstapriv->expire_to * 2) > 5) ? 5 : (pstapriv->expire_to * 2);

	}

	}
@@ -1667,9 +1645,7 @@ int rtw_sta_flush23a(struct rtw_adapter *padapter) 




	spin_lock_bh(&pstapriv->asoc_list_lock);

	spin_lock_bh(&pstapriv->asoc_list_lock);

	phead = &pstapriv->asoc_list;

	phead = &pstapriv->asoc_list;



	list_for_each_entry_safe(psta, ptmp, phead, asoc_list) {

	list_for_each_entry_safe(psta, ptmp, phead, asoc_list) {



		/* Remove sta from asoc_list */

		/* Remove sta from asoc_list */

		list_del_init(&psta->asoc_list);

		list_del_init(&psta->asoc_list);

		pstapriv->asoc_list_cnt--;

		pstapriv->asoc_list_cnt--;
@@ -1766,12 +1742,9 @@ void rtw_ap_restore_network(struct rtw_adapter *padapter) 
	}

	}





	spin_lock_bh(&pstapriv->asoc_list_lock);

	spin_lock_bh(&pstapriv->asoc_list_lock);



	phead = &pstapriv->asoc_list;

	phead = &pstapriv->asoc_list;



	list_for_each_entry_safe(psta, ptmp, phead, asoc_list)

	list_for_each_entry_safe(psta, ptmp, phead, asoc_list)

		chk_alive_list[chk_alive_num++] = psta;

		chk_alive_list[chk_alive_num++] = psta;



	spin_unlock_bh(&pstapriv->asoc_list_lock);

	spin_unlock_bh(&pstapriv->asoc_list_lock);





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

	for (i = 0; i < chk_alive_num; i++) {
@@ -1852,14 +1825,10 @@ void stop_ap_mode23a(struct rtw_adapter *padapter) 
	/* for ACL */

	/* for ACL */

	spin_lock_bh(&pacl_node_q->lock);

	spin_lock_bh(&pacl_node_q->lock);

	phead = get_list_head(pacl_node_q);

	phead = get_list_head(pacl_node_q);



	list_for_each_entry_safe(paclnode, ptmp, phead, list) {

	list_for_each_entry_safe(paclnode, ptmp, phead, list) {



		if (paclnode->valid == true) {

		if (paclnode->valid == true) {

			paclnode->valid = false;

			paclnode->valid = false;



			list_del_init(&paclnode->list);

			list_del_init(&paclnode->list);



			pacl_list->num--;

			pacl_list->num--;

		}

		}

	}

	}

drivers/staging/rtl8723au/core/rtw_mlme.c

+0 −10
Original line number Original line Diff line number Diff line
@@ -177,12 +177,9 @@ void rtw_free_network_queue23a(struct rtw_adapter *padapter) 
	struct rtw_queue *scanned_queue = &pmlmepriv->scanned_queue;

	struct rtw_queue *scanned_queue = &pmlmepriv->scanned_queue;





	spin_lock_bh(&scanned_queue->lock);

	spin_lock_bh(&scanned_queue->lock);



	phead = get_list_head(scanned_queue);

	phead = get_list_head(scanned_queue);



	list_for_each_entry_safe(pnetwork, ptmp, phead, list)

	list_for_each_entry_safe(pnetwork, ptmp, phead, list)

		_rtw_free_network23a(pmlmepriv, pnetwork);

		_rtw_free_network23a(pmlmepriv, pnetwork);



	spin_unlock_bh(&scanned_queue->lock);

	spin_unlock_bh(&scanned_queue->lock);

}

}
@@ -331,9 +328,7 @@ rtw_get_oldest_wlan_network23a(struct rtw_queue *scanned_queue) 
	struct wlan_network *oldest = NULL;

	struct wlan_network *oldest = NULL;





	phead = get_list_head(scanned_queue);

	phead = get_list_head(scanned_queue);



	list_for_each_entry(pwlan, phead, list) {

	list_for_each_entry(pwlan, phead, list) {



		if (pwlan->fixed != true) {

		if (pwlan->fixed != true) {

			if (!oldest || time_after(oldest->last_scanned,

			if (!oldest || time_after(oldest->last_scanned,

						  pwlan->last_scanned))

						  pwlan->last_scanned))
@@ -441,7 +436,6 @@ static void rtw_update_scanned_network(struct rtw_adapter *adapter, 




	spin_lock_bh(&queue->lock);

	spin_lock_bh(&queue->lock);

	phead = get_list_head(queue);

	phead = get_list_head(queue);



	list_for_each(plist, phead) {

	list_for_each(plist, phead) {

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

		pnetwork = container_of(plist, struct wlan_network, list);
@@ -712,14 +706,11 @@ static void free_scanqueue(struct mlme_priv *pmlmepriv) 




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

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

	spin_lock_bh(&scan_queue->lock);

	spin_lock_bh(&scan_queue->lock);



	phead = get_list_head(scan_queue);

	phead = get_list_head(scan_queue);



	list_for_each_entry_safe(pnetwork, ptemp, phead, list) {

	list_for_each_entry_safe(pnetwork, ptemp, phead, list) {

		pnetwork->fixed = false;

		pnetwork->fixed = false;

		_rtw_free_network23a(pmlmepriv, pnetwork);

		_rtw_free_network23a(pmlmepriv, pnetwork);

	}

	}



	spin_unlock_bh(&scan_queue->lock);

	spin_unlock_bh(&scan_queue->lock);

}

}
@@ -1626,7 +1617,6 @@ rtw_select_candidate_from_queue(struct mlme_priv *pmlmepriv) 




	spin_lock_bh(&pmlmepriv->scanned_queue.lock);

	spin_lock_bh(&pmlmepriv->scanned_queue.lock);

	phead = get_list_head(queue);

	phead = get_list_head(queue);



	list_for_each_entry_safe(pnetwork, ptmp, phead, list) {

	list_for_each_entry_safe(pnetwork, ptmp, phead, list) {

		if (!pnetwork) {

		if (!pnetwork) {

			RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_,

			RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_,

drivers/staging/rtl8723au/core/rtw_mlme_ext.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -6096,7 +6096,6 @@ int tx_beacon_hdl23a(struct rtw_adapter *padapter, const u8 *pbuf) 
				rtl8723au_hal_xmitframe_enqueue(padapter,

				rtl8723au_hal_xmitframe_enqueue(padapter,

								pxmitframe);

								pxmitframe);

			}

			}



			/* spin_unlock_bh(&psta_bmc->sleep_q.lock); */

			/* spin_unlock_bh(&psta_bmc->sleep_q.lock); */

			spin_unlock_bh(&pxmitpriv->lock);

			spin_unlock_bh(&pxmitpriv->lock);

		}

		}

drivers/staging/rtl8723au/core/rtw_recv.c

+4 −11
Original line number Original line Diff line number Diff line
@@ -198,12 +198,9 @@ static void rtw_free_recvframe23a_queue(struct rtw_queue *pframequeue) 
	struct list_head *phead;

	struct list_head *phead;





	spin_lock(&pframequeue->lock);

	spin_lock(&pframequeue->lock);



	phead = get_list_head(pframequeue);

	phead = get_list_head(pframequeue);



	list_for_each_entry_safe(hdr, ptmp, phead, list)

	list_for_each_entry_safe(hdr, ptmp, phead, list)

		rtw_free_recvframe23a(hdr);

		rtw_free_recvframe23a(hdr);



	spin_unlock(&pframequeue->lock);

	spin_unlock(&pframequeue->lock);

}

}
@@ -1553,8 +1550,6 @@ struct recv_frame *recvframe_defrag(struct rtw_adapter *adapter, 
	struct rtw_queue *pfree_recv_queue;

	struct rtw_queue *pfree_recv_queue;

	struct sk_buff *skb;

	struct sk_buff *skb;









	curfragnum = 0;

	curfragnum = 0;

	pfree_recv_queue = &adapter->recvpriv.free_recv_queue;

	pfree_recv_queue = &adapter->recvpriv.free_recv_queue;
@@ -1617,8 +1612,6 @@ struct recv_frame *recvframe_defrag(struct rtw_adapter *adapter, 
	RT_TRACE(_module_rtl871x_recv_c_, _drv_info_,

	RT_TRACE(_module_rtl871x_recv_c_, _drv_info_,

		 "Performance defrag!!!!!\n");

		 "Performance defrag!!!!!\n");









	return prframe;

	return prframe;

}

}

drivers/staging/rtl8723au/core/rtw_sta_mgt.c

+1 −10
Original line number Original line Diff line number Diff line
@@ -93,7 +93,6 @@ int _rtw_free_sta_priv23a(struct sta_priv *pstapriv) 
		spin_lock_bh(&pstapriv->sta_hash_lock);

		spin_lock_bh(&pstapriv->sta_hash_lock);

		for (index = 0; index < NUM_STA; index++) {

		for (index = 0; index < NUM_STA; index++) {

			phead = &pstapriv->sta_hash[index];

			phead = &pstapriv->sta_hash[index];



			list_for_each_entry_safe(psta, ptmp, phead, hash_list) {

			list_for_each_entry_safe(psta, ptmp, phead, hash_list) {

				int i;

				int i;
@@ -333,12 +332,9 @@ void rtw_free_all_stainfo23a(struct rtw_adapter *padapter) 
		return;

		return;





	spin_lock_bh(&pstapriv->sta_hash_lock);

	spin_lock_bh(&pstapriv->sta_hash_lock);



	for (index = 0; index < NUM_STA; index++) {

	for (index = 0; index < NUM_STA; index++) {

		phead = &pstapriv->sta_hash[index];

		phead = &pstapriv->sta_hash[index];



		list_for_each_entry_safe(psta, ptmp, phead, hash_list) {

		list_for_each_entry_safe(psta, ptmp, phead, hash_list) {



			if (pbcmc_stainfo != psta)

			if (pbcmc_stainfo != psta)

				rtw_free_stainfo23a(padapter, psta);

				rtw_free_stainfo23a(padapter, psta);

		}

		}
@@ -365,11 +361,8 @@ struct sta_info *rtw_get_stainfo23a(struct sta_priv *pstapriv, const u8 *hwaddr) 
	index = wifi_mac_hash(addr);

	index = wifi_mac_hash(addr);





	spin_lock_bh(&pstapriv->sta_hash_lock);

	spin_lock_bh(&pstapriv->sta_hash_lock);



	phead = &pstapriv->sta_hash[index];

	phead = &pstapriv->sta_hash[index];



	list_for_each_entry(psta, phead, hash_list) {

	list_for_each_entry(psta, phead, hash_list) {



		/*  if found the matched address */

		/*  if found the matched address */

		if (ether_addr_equal(psta->hwaddr, addr))

		if (ether_addr_equal(psta->hwaddr, addr))

			break;

			break;
@@ -423,9 +416,7 @@ bool rtw_access_ctrl23a(struct rtw_adapter *padapter, u8 *mac_addr) 




	spin_lock_bh(&pacl_node_q->lock);

	spin_lock_bh(&pacl_node_q->lock);

	phead = get_list_head(pacl_node_q);

	phead = get_list_head(pacl_node_q);



	list_for_each_entry(paclnode, phead, list) {

	list_for_each_entry(paclnode, phead, list) {



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

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

			if (paclnode->valid) {

			if (paclnode->valid) {

				match = true;

				match = true;