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

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

staging: rtl8723au: Get rid of _rtw_free_network23a_nolock23a() 



_rtw_free_network23a() and _rtw_free_network23a_nolock23a() are now
identical - one copy should do.

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

drivers/staging/rtl8723au/core/rtw_mlme.c

+1 −15
Original line number Original line Diff line number Diff line
@@ -160,20 +160,6 @@ static void _rtw_free_network23a(struct mlme_priv *pmlmepriv, 
	kfree(pnetwork);

	kfree(pnetwork);

}

}





void _rtw_free_network23a_nolock23a(struct mlme_priv *pmlmepriv,

				    struct wlan_network *pnetwork)

{

	if (!pnetwork)

		return;



	if (pnetwork->fixed == true)

		return;



	list_del_init(&pnetwork->list);



	kfree(pnetwork);

}



/*

/*

 return the wlan_network with the matching addr

 return the wlan_network with the matching addr
@@ -349,7 +335,7 @@ __le16 *rtw_get_beacon_interval23a_from_ie(u8 *ie) 
static void rtw_free_network_nolock(struct mlme_priv *pmlmepriv,

static void rtw_free_network_nolock(struct mlme_priv *pmlmepriv,

				    struct wlan_network *pnetwork)

				    struct wlan_network *pnetwork)

{

{

	_rtw_free_network23a_nolock23a(pmlmepriv, pnetwork);

	_rtw_free_network23a(pmlmepriv, pnetwork);

}

}





int rtw_is_same_ibss23a(struct rtw_adapter *adapter,

int rtw_is_same_ibss23a(struct rtw_adapter *adapter,

drivers/staging/rtl8723au/include/rtw_mlme.h

+0 −3
Original line number Original line Diff line number Diff line
@@ -456,9 +456,6 @@ void _rtw_free_mlme_priv23a(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_network23a_nolock23a(struct mlme_priv *pmlmepriv,

			      struct wlan_network *pnetwork);



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