Commit d007b7f4 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville

b43(legacy): include full timestamp in beacon frames

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.)
Signed-off-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarMichael Buesch <mb@bu3sch.de>
Signed-off-by: default avatarStefano Brivio <stefano.brivio@polimi.it>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent aa68cbfb
...@@ -589,12 +589,16 @@ void b43_rx(struct b43_wldev *dev, struct sk_buff *skb, const void *_rxhdr) ...@@ -589,12 +589,16 @@ void b43_rx(struct b43_wldev *dev, struct sk_buff *skb, const void *_rxhdr)
status.antenna = !!(phystat0 & B43_RX_PHYST0_ANT); status.antenna = !!(phystat0 & B43_RX_PHYST0_ANT);
/* /*
* If monitors are present get full 64-bit timestamp. This * All frames on monitor interfaces and beacons always need a full
* code assumes we get to process the packet within 16 bits * 64-bit timestamp. Monitor interfaces need it for diagnostic
* of timestamp, i.e. about 65 milliseconds after the PHY * purposes and beacons for IBSS merging.
* received the first symbol. * 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; u16 low_mactime_now;
b43_tsf_read(dev, &status.mactime); b43_tsf_read(dev, &status.mactime);
......
...@@ -546,12 +546,16 @@ void b43legacy_rx(struct b43legacy_wldev *dev, ...@@ -546,12 +546,16 @@ void b43legacy_rx(struct b43legacy_wldev *dev,
status.antenna = !!(phystat0 & B43legacy_RX_PHYST0_ANT); status.antenna = !!(phystat0 & B43legacy_RX_PHYST0_ANT);
/* /*
* If monitors are present get full 64-bit timestamp. This * All frames on monitor interfaces and beacons always need a full
* code assumes we get to process the packet within 16 bits * 64-bit timestamp. Monitor interfaces need it for diagnostic
* of timestamp, i.e. about 65 milliseconds after the PHY * purposes and beacons for IBSS merging.
* received the first symbol. * 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; u16 low_mactime_now;
b43legacy_tsf_read(dev, &status.mactime); b43legacy_tsf_read(dev, &status.mactime);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment