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

Commit 30cbd422 authored by Luis R. Rodriguez's avatar Luis R. Rodriguez Committed by John W. Linville
Browse files

ath9k_hw: move ath_extend_tsf() to hw code to share as ath9k_hw_extend_tsf() 



This will be shared between ath9k and ath9k_htc.

Signed-off-by: default avatarLuis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 26ab2645

drivers/net/wireless/ath/ath9k/hw.c

+15 −0
Original line number Diff line number Diff line
@@ -3710,6 +3710,21 @@ void ath9k_hw_set_tsfadjust(struct ath_hw *ah, u32 setting) 
}

EXPORT_SYMBOL(ath9k_hw_set_tsfadjust);



/*

 *  Extend 15-bit time stamp from rx descriptor to

 *  a full 64-bit TSF using the current h/w TSF.

*/

u64 ath9k_hw_extend_tsf(struct ath_hw *ah, u32 rstamp)

{

	u64 tsf;



	tsf = ath9k_hw_gettsf64(ah);

	if ((tsf & 0x7fff) < rstamp)

		tsf -= 0x8000;

	return (tsf & ~0x7fff) | rstamp;

}

EXPORT_SYMBOL(ath9k_hw_extend_tsf);



bool ath9k_hw_setslottime(struct ath_hw *ah, u32 us)

{

	if (us < ATH9K_SLOT_TIME_9 || us > ath9k_hw_mac_to_usec(ah, 0xffff)) {

drivers/net/wireless/ath/ath9k/hw.h

+1 −0
Original line number Diff line number Diff line
@@ -689,6 +689,7 @@ u64 ath9k_hw_gettsf64(struct ath_hw *ah); 
void ath9k_hw_settsf64(struct ath_hw *ah, u64 tsf64);

void ath9k_hw_reset_tsf(struct ath_hw *ah);

void ath9k_hw_set_tsfadjust(struct ath_hw *ah, u32 setting);

u64 ath9k_hw_extend_tsf(struct ath_hw *ah, u32 rstamp);

bool ath9k_hw_setslottime(struct ath_hw *ah, u32 us);

void ath9k_hw_set11nmac2040(struct ath_hw *ah);

void ath9k_hw_beaconinit(struct ath_hw *ah, u32 next_beacon, u32 beacon_period);

drivers/net/wireless/ath/ath9k/recv.c

+1 −15
Original line number Diff line number Diff line
@@ -86,20 +86,6 @@ static void ath_setdefantenna(struct ath_softc *sc, u32 antenna) 
	sc->rx.rxotherant = 0;

}



/*

 *  Extend 15-bit time stamp from rx descriptor to

 *  a full 64-bit TSF using the current h/w TSF.

*/

static u64 ath_extend_tsf(struct ath_softc *sc, u32 rstamp)

{

	u64 tsf;



	tsf = ath9k_hw_gettsf64(sc->sc_ah);

	if ((tsf & 0x7fff) < rstamp)

		tsf -= 0x8000;

	return (tsf & ~0x7fff) | rstamp;

}



/*

 * For Decrypt or Demic errors, we only mark packet status here and always push

 * up the frame up to let mac80211 handle the actual error case, be it no
@@ -223,7 +209,7 @@ static int ath_rx_prepare(struct ieee80211_hw *hw, 
	if (ieee80211_is_beacon(fc))

		sc->sc_ah->stats.avgbrssi = rx_stats->rs_rssi;



	rx_status->mactime = ath_extend_tsf(sc, rx_stats->rs_tstamp);

	rx_status->mactime = ath9k_hw_extend_tsf(sc->sc_ah, rx_stats->rs_tstamp);

	rx_status->band = hw->conf.channel->band;

	rx_status->freq = hw->conf.channel->center_freq;

	rx_status->noise = sc->ani.noise_floor;