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

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

staging: rtl8723au: Fold _rtw_init_mlme_priv23a() into rtw_init_mlme_priv23a() 



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

drivers/staging/rtl8723au/core/rtw_mlme.c

+1 −10
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ static void rtw_init_mlme_timer(struct rtw_adapter *padapter) 
		    rtw_set_scan_deny_timer_hdl, (unsigned long)padapter);

}



int _rtw_init_mlme_priv23a(struct rtw_adapter *padapter)

int rtw_init_mlme_priv23a(struct rtw_adapter *padapter)

{

	struct mlme_priv *pmlmepriv = &padapter->mlmepriv;

	int res = _SUCCESS;
@@ -352,15 +352,6 @@ __le16 *rtw_get_beacon_interval23a_from_ie(u8 *ie) 
	return (__le16 *)(ie + 8);

}



int rtw_init_mlme_priv23a (struct rtw_adapter *padapter)

{

	int	res;



	res = _rtw_init_mlme_priv23a(padapter);



	return res;

}



static void rtw_free_network_nolock(struct mlme_priv *pmlmepriv,

				    struct wlan_network *pnetwork)

{

drivers/staging/rtl8723au/include/rtw_mlme.h

+0 −2
Original line number Diff line number Diff line
@@ -450,8 +450,6 @@ void rtw_clear_scan_deny(struct rtw_adapter *adapter); 
void rtw_set_scan_deny_timer_hdl(unsigned long data);

void rtw_set_scan_deny(struct rtw_adapter *adapter, u32 ms);



int _rtw_init_mlme_priv23a(struct rtw_adapter *padapter);



void rtw23a_free_mlme_priv_ie_data(struct mlme_priv *pmlmepriv);



void _rtw_free_mlme_priv23a(struct mlme_priv *pmlmepriv);