2008/1/21, Bruno Randolf <bruno@xxxxxxxxxxxxx>: > 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: Bruno Randolf <bruno@xxxxxxxxxxxxx> > --- > > drivers/net/wireless/ath5k/base.c | 17 ++++++++++++----- > 1 files changed, 12 insertions(+), 5 deletions(-) > > > diff --git a/drivers/net/wireless/ath5k/base.c b/drivers/net/wireless/ath5k/base.c > index 6bbee64..d7d274f 100644 > --- a/drivers/net/wireless/ath5k/base.c > +++ b/drivers/net/wireless/ath5k/base.c > @@ -1725,11 +1725,18 @@ accept: > 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; > > Acked-by: Nick Kossifidis <mickflemm@xxxxxxxxx> -- GPG ID: 0xD21DB2DB As you read this post global entropy rises. Have Fun ;-) Nick - To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
