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

Commit ffb1c56a authored by Ashok Nagarajan's avatar Ashok Nagarajan Committed by John W. Linville
Browse files

ath9k: Fix mactime from being clobbered in rx_status 



mactime was being overwritten by the function ath9k_rx_skb_preprocess. Fixed by
memsetting rx_status in ath_rx_tasklet.

Signed-off-by: default avatarAshok Nagarajan <ashok@cozybit.com>
Signed-off-by: default avatarJavier Cardona <javier@cozybit.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 9f61903c

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

+2 −2
Original line number Diff line number Diff line
@@ -982,8 +982,6 @@ static int ath9k_rx_skb_preprocess(struct ath_common *common, 
{

	struct ath_hw *ah = common->ah;



	memset(rx_status, 0, sizeof(struct ieee80211_rx_status));



	/*

	 * everything but the rate is checked here, the rate check is done

	 * separately to avoid doing two lookups for a rate for each frame.
@@ -1841,6 +1839,8 @@ int ath_rx_tasklet(struct ath_softc *sc, int flush, bool hp) 
		if (sc->sc_flags & SC_OP_RXFLUSH)

			goto requeue_drop_frag;



		memset(rxs, 0, sizeof(struct ieee80211_rx_status));



		rxs->mactime = (tsf & ~0xffffffffULL) | rs.rs_tstamp;

		if (rs.rs_tstamp > tsf_lower &&

		    unlikely(rs.rs_tstamp - tsf_lower > 0x10000000))