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

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

staging: rtl8723au: clean up update_TSF() 



Clean up and simplify update_TSF() using proper Linux functions and
move it to rtw_mlme_ext.c which is the only user of it.

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

drivers/staging/rtl8723au/core/rtw_mlme_ext.c

+8 −5
Original line number Diff line number Diff line
@@ -249,6 +249,12 @@ static struct fwevent wlanevents[] = 
};





static void

rtw_update_TSF(struct mlme_ext_priv *pmlmeext, struct ieee80211_mgmt *mgmt)

{

	pmlmeext->TSFValue = get_unaligned_le64(&mgmt->u.beacon.timestamp);

}



/*

 * Search the @param channel_num in given @param channel_set

 * @ch_set: the given channel set
@@ -785,7 +791,7 @@ OnBeacon23a(struct rtw_adapter *padapter, struct recv_frame *precv_frame) 
					  offsetof(struct ieee80211_mgmt, u));



		/* update TSF Value */

		update_TSF23a(pmlmeext, pframe, pkt_len);

		rtw_update_TSF(pmlmeext, mgmt);



		/* start auth */

		start_clnt_auth23a(padapter);
@@ -838,7 +844,7 @@ OnBeacon23a(struct rtw_adapter *padapter, struct recv_frame *precv_frame) 
			}



			/* update TSF Value */

			update_TSF23a(pmlmeext, pframe, pkt_len);

			rtw_update_TSF(pmlmeext, mgmt);



			/* report sta add event */

			report_add_sta_event23a(padapter, mgmt->sa,
@@ -5492,9 +5498,6 @@ void mlmeext_sta_add_event_callback23a(struct rtw_adapter *padapter, struct sta_ 
		}

		else/* adhoc client */

		{

			/* update TSF Value */

			/* update_TSF23a(pmlmeext, pframe, len); */



			/*  correcting TSF */

			correct_TSF23a(padapter, pmlmeext);

drivers/staging/rtl8723au/core/rtw_wlan_util.c

+0 −15
Original line number Diff line number Diff line
@@ -1643,21 +1643,6 @@ void process_addba_req23a(struct rtw_adapter *padapter, u8 *paddba_req, u8 *addr 
	}

}



void update_TSF23a(struct mlme_ext_priv *pmlmeext, u8 *pframe, uint len)

{

	u8 *pIE;

	u32 *pbuf;



	pIE = pframe + sizeof(struct ieee80211_hdr_3addr);

	pbuf = (u32 *)pIE;



	pmlmeext->TSFValue = le32_to_cpu(*(pbuf+1));



	pmlmeext->TSFValue = pmlmeext->TSFValue << 32;



	pmlmeext->TSFValue |= le32_to_cpu(*pbuf);

}



void correct_TSF23a(struct rtw_adapter *padapter,

		    struct mlme_ext_priv *pmlmeext)

{

drivers/staging/rtl8723au/include/rtw_mlme_ext.h

+0 −1
Original line number Diff line number Diff line
@@ -635,7 +635,6 @@ int cckratesonly_included23a(unsigned char *rate, int ratelen); 


void process_addba_req23a(struct rtw_adapter *padapter, u8 *paddba_req, u8 *addr);



void update_TSF23a(struct mlme_ext_priv *pmlmeext, u8 *pframe, uint len);

void correct_TSF23a(struct rtw_adapter *padapter, struct mlme_ext_priv *pmlmeext);



struct cmd_hdl {