On Mon, 18 Feb 2008 18:53:55 +0100 Michael Buesch <mb@xxxxxxxxx> wrote: > From: Johannes Berg <johannes@xxxxxxxxxxxxxxxx> > > Having the full RX timestamp in beacons is necessary for IBSS > merge to work properly so extend the 16-bit timestamp to the > full 64 bits for beacon frames (as well as when monitor mode > is active.) > --- everything.orig/drivers/net/wireless/b43legacy/xmit.c 2008-02-06 17:38:25.416098905 +0100 > +++ everything/drivers/net/wireless/b43legacy/xmit.c 2008-02-18 09:04:40.471819824 +0100 > @@ -546,12 +546,16 @@ void b43legacy_rx(struct b43legacy_wldev > status.antenna = !!(phystat0 & B43legacy_RX_PHYST0_ANT); > > /* > - * If monitors are present get full 64-bit timestamp. This > - * code assumes we get to process the packet within 16 bits > - * of timestamp, i.e. about 65 milliseconds after the PHY > - * received the first symbol. > + * All frames on monitor interfaces and beacons always need a full > + * 64-bit timestamp. Monitor interfaces need it for diagnostic > + * purposes and beacons for IBSS merging. > + * This code assumes we get to process the packet within 16 bits > + * of timestamp, i.e. about 65 milliseconds after the PHY received > + * the first symbol. > */ > - if (dev->wl->radiotap_enabled) { > + if (((fctl & (IEEE80211_FCTL_FTYPE | IEEE80211_FCTL_STYPE)) > + == (IEEE80211_FTYPE_MGMT | IEEE80211_STYPE_BEACON)) || > + dev->wl->radiotap_enabled) { > u16 low_mactime_now; > > b43legacy_tsf_read(dev, &status.mactime); Signed-off-by: Stefano Brivio <stefano.brivio@xxxxxxxxx> -- Ciao Stefano - 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