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

Commit c0e1899b authored by Bruno Randolf's avatar Bruno Randolf Committed by David S. Miller
Browse files

ath5k: always extend rx timestamp with tsf 



always extend the rx timestamp with the local TSF, since this information is
also needed for proper IBSS merging. this is done in the tasklet for now, maybe
has to be moved to the interrupt handler like in madwifi.

drivers/net/wireless/ath5k/base.c:      Changes-licensed-under: 3-Clause-BSD

Signed-off-by: default avatarBruno Randolf <bruno@thinktube.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 6d91e1d8

drivers/net/wireless/ath5k/base.c

+12 −5
Original line number Diff line number Diff line
@@ -1775,11 +1775,18 @@ ath5k_tasklet_rx(unsigned long data) 
			skb_pull(skb, pad);

		}



		if (sc->opmode == IEEE80211_IF_TYPE_MNTR)

			rxs.mactime = ath5k_extend_tsf(sc->ah,

					ds->ds_rxstat.rs_tstamp);

		else

			rxs.mactime = ds->ds_rxstat.rs_tstamp;

		/*

		 * always extend the mac timestamp, since this information is

		 * also needed for proper IBSS merging.

		 *

		 * XXX: it might be too late to do it here, since rs_tstamp is

		 * 15bit only. that means TSF extension has to be done within

		 * 32768usec (about 32ms). it might be necessary to move this to

		 * the interrupt handler, like it is done in madwifi.

		 */

		rxs.mactime = ath5k_extend_tsf(sc->ah, ds->ds_rxstat.rs_tstamp);

		rxs.flag |= RX_FLAG_TSFT;



		rxs.freq = sc->curchan->freq;

		rxs.channel = sc->curchan->chan;

		rxs.phymode = sc->curmode;