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

Commit f56d9685 authored by Jes Sorensen's avatar Jes Sorensen Committed by Greg Kroah-Hartman
Browse files

staging: rtl8723au: Fold _rtw_find_network23a() into rtw_find_network23a() 



Signed-off-by: default avatarJes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8c47af22

drivers/staging/rtl8723au/core/rtw_mlme.c

+1 −16
Original line number Original line Diff line number Diff line
@@ -186,7 +186,7 @@ void _rtw_free_network23a_nolock23a(struct mlme_priv *pmlmepriv, 
 Shall be calle under atomic context... to avoid possible racing condition...

 Shall be calle under atomic context... to avoid possible racing condition...

*/

*/

struct wlan_network *

struct wlan_network *

_rtw_find_network23a(struct rtw_queue *scanned_queue, u8 *addr)

rtw_find_network23a(struct rtw_queue *scanned_queue, u8 *addr)

{

{

	struct list_head *phead, *plist;

	struct list_head *phead, *plist;

	struct wlan_network *pnetwork = NULL;

	struct wlan_network *pnetwork = NULL;
@@ -358,21 +358,6 @@ static void rtw_free_network_nolock(struct mlme_priv *pmlmepriv, 
	_rtw_free_network23a_nolock23a(pmlmepriv, pnetwork);

	_rtw_free_network23a_nolock23a(pmlmepriv, pnetwork);

}

}





/*

 return the wlan_network with the matching addr



 Shall be calle under atomic context... to avoid possible racing condition...

*/

struct	wlan_network *

rtw_find_network23a(struct rtw_queue *scanned_queue, u8 *addr)

{

	struct wlan_network *pnetwork;



	pnetwork = _rtw_find_network23a(scanned_queue, addr);



	return pnetwork;

}



int rtw_is_same_ibss23a(struct rtw_adapter *adapter,

int rtw_is_same_ibss23a(struct rtw_adapter *adapter,

			struct wlan_network *pnetwork)

			struct wlan_network *pnetwork)

{

{

drivers/staging/rtl8723au/include/rtw_mlme.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -459,8 +459,6 @@ struct wlan_network *rtw_alloc_network(struct mlme_priv *pmlmepriv); 
void _rtw_free_network23a_nolock23a(struct mlme_priv *pmlmepriv,

void _rtw_free_network23a_nolock23a(struct mlme_priv *pmlmepriv,

			      struct wlan_network *pnetwork);

			      struct wlan_network *pnetwork);





struct wlan_network *_rtw_find_network23a(struct rtw_queue *scanned_queue, u8 *addr);



int rtw_if_up23a(struct rtw_adapter *padapter);

int rtw_if_up23a(struct rtw_adapter *padapter);





int rtw_linked_check(struct rtw_adapter *padapter);

int rtw_linked_check(struct rtw_adapter *padapter);