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

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

staging: rtl8723au: Eliminate last rtw_get_beacon_interval*() usage 



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

drivers/staging/rtl8723au/core/rtw_mlme.c

+0 −5
Original line number Diff line number Diff line
@@ -312,11 +312,6 @@ void rtw23a_roaming(struct rtw_adapter *padapter, 
	spin_unlock_bh(&pmlmepriv->lock);

}



__le16 *rtw_get_beacon_interval23a_from_ie(u8 *ie)

{

	return (__le16 *)(ie + 8);

}



static void rtw_free_network_nolock(struct mlme_priv *pmlmepriv,

				    struct wlan_network *pnetwork)

{

drivers/staging/rtl8723au/core/rtw_mlme_ext.c

+2 −2
Original line number Diff line number Diff line
@@ -4411,7 +4411,7 @@ static void start_create_ibss(struct rtw_adapter* padapter) 
	struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;

	struct wlan_bssid_ex *pnetwork = &pmlmeinfo->network;

	pmlmeext->cur_channel = (u8)pnetwork->DSConfig;

	pmlmeinfo->bcn_interval = get_beacon_interval23a(pnetwork);

	pmlmeinfo->bcn_interval = pnetwork->beacon_interval;



	/* update wireless mode */

	update_wireless_mode23a(padapter);
@@ -4466,7 +4466,7 @@ static void start_clnt_join(struct rtw_adapter* padapter) 
	int beacon_timeout;



	pmlmeext->cur_channel = (u8)pnetwork->DSConfig;

	pmlmeinfo->bcn_interval = get_beacon_interval23a(pnetwork);

	pmlmeinfo->bcn_interval = pnetwork->beacon_interval;



	/* update wireless mode */

	update_wireless_mode23a(padapter);

drivers/staging/rtl8723au/core/rtw_wlan_util.c

+0 −8
Original line number Diff line number Diff line
@@ -399,14 +399,6 @@ inline u8 *get_my_bssid23a(struct wlan_bssid_ex *pnetwork) 
	return pnetwork->MacAddress;

}



u16 get_beacon_interval23a(struct wlan_bssid_ex *bss)

{

	unsigned short val;

	memcpy(&val, rtw_get_beacon_interval23a_from_ie(bss->IEs), 2);



	return le16_to_cpu(val);

}



bool is_client_associated_to_ap23a(struct rtw_adapter *padapter)

{

	struct mlme_ext_priv *pmlmeext;

drivers/staging/rtl8723au/include/rtw_mlme.h

+0 −3
Original line number Diff line number Diff line
@@ -348,9 +348,6 @@ int rtw_if_up23a(struct rtw_adapter *padapter); 


int rtw_linked_check(struct rtw_adapter *padapter);



__le16 *rtw_get_beacon_interval23a_from_ie(u8 *ie);





void rtw_joinbss_reset23a(struct rtw_adapter *padapter);



bool rtw_restructure_ht_ie23a(struct rtw_adapter *padapter, u8 *in_ie,

drivers/staging/rtl8723au/include/rtw_mlme_ext.h

+0 −1
Original line number Diff line number Diff line
@@ -499,7 +499,6 @@ void update_network23a(struct wlan_bssid_ex *dst, struct wlan_bssid_ex *src, 
		    struct rtw_adapter *padapter, bool update_ie);



u8 *get_my_bssid23a(struct wlan_bssid_ex *pnetwork);

u16 get_beacon_interval23a(struct wlan_bssid_ex *bss);



bool is_client_associated_to_ap23a(struct rtw_adapter *padapter);

bool is_client_associated_to_ibss23a(struct rtw_adapter *padapter);