From: Jes Sorensen Date: Tue, 15 Apr 2014 17:44:28 +0000 (+0200) Subject: staging: rtl8723au: update_TSF() remove unused argument and move to rtw_mlme_ext.c X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=0e9596992cfc1b3804d436ccbea97b66aeca00c0;p=openwrt%2Fstaging%2Fblogic.git staging: rtl8723au: update_TSF() remove unused argument and move to rtw_mlme_ext.c This is only called from rtw_mlme_ext.c, so move it that and declare it static. Signed-off-by: Jes Sorensen Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/rtl8723au/core/rtw_mlme_ext.c b/drivers/staging/rtl8723au/core/rtw_mlme_ext.c index cb341529a1f3..2a3d3f7527c9 100644 --- a/drivers/staging/rtl8723au/core/rtw_mlme_ext.c +++ b/drivers/staging/rtl8723au/core/rtw_mlme_ext.c @@ -249,6 +249,11 @@ static struct fwevent wlanevents[] = }; +static void rtw_correct_TSF(struct rtw_adapter *padapter) +{ + hw_var_set_correct_tsf(padapter); +} + static void rtw_update_TSF(struct mlme_ext_priv *pmlmeext, struct ieee80211_mgmt *mgmt) { @@ -5472,7 +5477,7 @@ void mlmeext_joinbss_event_callback23a(struct rtw_adapter *padapter, int join_re if ((pmlmeinfo->state&0x03) == WIFI_FW_STATION_STATE) { /* correcting TSF */ - correct_TSF23a(padapter, pmlmeext); + rtw_correct_TSF(padapter); /* set_link_timer(pmlmeext, DISCONNECT_TO); */ } @@ -5499,7 +5504,7 @@ void mlmeext_sta_add_event_callback23a(struct rtw_adapter *padapter, struct sta_ else/* adhoc client */ { /* correcting TSF */ - correct_TSF23a(padapter, pmlmeext); + rtw_correct_TSF(padapter); /* start beacon */ if (send_beacon23a(padapter) == _FAIL) diff --git a/drivers/staging/rtl8723au/core/rtw_wlan_util.c b/drivers/staging/rtl8723au/core/rtw_wlan_util.c index bf53973b2204..8824dd4fb55d 100644 --- a/drivers/staging/rtl8723au/core/rtw_wlan_util.c +++ b/drivers/staging/rtl8723au/core/rtw_wlan_util.c @@ -1643,12 +1643,6 @@ void process_addba_req23a(struct rtw_adapter *padapter, u8 *paddba_req, u8 *addr } } -void correct_TSF23a(struct rtw_adapter *padapter, - struct mlme_ext_priv *pmlmeext) -{ - hw_var_set_correct_tsf(padapter); -} - void beacon_timing_control23a(struct rtw_adapter *padapter) { rtw_hal_bcn_related_reg_setting23a(padapter);