diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2008-02-18 12:53:55 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-02-29 15:37:12 -0500 |
commit | d007b7f42e2a3a2b95ef43e8cc1a3dfe66b19736 (patch) | |
tree | 55bc6a2d04105489f6919b6c422e64fd3ff21ce2 /drivers | |
parent | aa68cbfb20b417d68dc45c9ef5f3e51546b438b0 (diff) |
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: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: Michael Buesch <mb@bu3sch.de>
Signed-off-by: Stefano Brivio <stefano.brivio@polimi.it>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/wireless/b43/xmit.c | 14 | ||||
-rw-r--r-- | drivers/net/wireless/b43legacy/xmit.c | 14 |
2 files changed, 18 insertions, 10 deletions
diff --git a/drivers/net/wireless/b43/xmit.c b/drivers/net/wireless/b43/xmit.c index 4014b6c8272b..187c11bee0f1 100644 --- a/drivers/net/wireless/b43/xmit.c +++ b/drivers/net/wireless/b43/xmit.c | |||
@@ -589,12 +589,16 @@ void b43_rx(struct b43_wldev *dev, struct sk_buff *skb, const void *_rxhdr) | |||
589 | status.antenna = !!(phystat0 & B43_RX_PHYST0_ANT); | 589 | status.antenna = !!(phystat0 & B43_RX_PHYST0_ANT); |
590 | 590 | ||
591 | /* | 591 | /* |
592 | * If monitors are present get full 64-bit timestamp. This | 592 | * All frames on monitor interfaces and beacons always need a full |
593 | * code assumes we get to process the packet within 16 bits | 593 | * 64-bit timestamp. Monitor interfaces need it for diagnostic |
594 | * of timestamp, i.e. about 65 milliseconds after the PHY | 594 | * purposes and beacons for IBSS merging. |
595 | * received the first symbol. | 595 | * This code assumes we get to process the packet within 16 bits |
596 | * of timestamp, i.e. about 65 milliseconds after the PHY received | ||
597 | * the first symbol. | ||
596 | */ | 598 | */ |
597 | if (dev->wl->radiotap_enabled) { | 599 | if (((fctl & (IEEE80211_FCTL_FTYPE | IEEE80211_FCTL_STYPE)) |
600 | == (IEEE80211_FTYPE_MGMT | IEEE80211_STYPE_BEACON)) || | ||
601 | dev->wl->radiotap_enabled) { | ||
598 | u16 low_mactime_now; | 602 | u16 low_mactime_now; |
599 | 603 | ||
600 | b43_tsf_read(dev, &status.mactime); | 604 | b43_tsf_read(dev, &status.mactime); |
diff --git a/drivers/net/wireless/b43legacy/xmit.c b/drivers/net/wireless/b43legacy/xmit.c index 47e130e9fdf2..dcad2491a606 100644 --- a/drivers/net/wireless/b43legacy/xmit.c +++ b/drivers/net/wireless/b43legacy/xmit.c | |||
@@ -546,12 +546,16 @@ void b43legacy_rx(struct b43legacy_wldev *dev, | |||
546 | status.antenna = !!(phystat0 & B43legacy_RX_PHYST0_ANT); | 546 | status.antenna = !!(phystat0 & B43legacy_RX_PHYST0_ANT); |
547 | 547 | ||
548 | /* | 548 | /* |
549 | * If monitors are present get full 64-bit timestamp. This | 549 | * All frames on monitor interfaces and beacons always need a full |
550 | * code assumes we get to process the packet within 16 bits | 550 | * 64-bit timestamp. Monitor interfaces need it for diagnostic |
551 | * of timestamp, i.e. about 65 milliseconds after the PHY | 551 | * purposes and beacons for IBSS merging. |
552 | * received the first symbol. | 552 | * This code assumes we get to process the packet within 16 bits |
553 | * of timestamp, i.e. about 65 milliseconds after the PHY received | ||
554 | * the first symbol. | ||
553 | */ | 555 | */ |
554 | if (dev->wl->radiotap_enabled) { | 556 | if (((fctl & (IEEE80211_FCTL_FTYPE | IEEE80211_FCTL_STYPE)) |
557 | == (IEEE80211_FTYPE_MGMT | IEEE80211_STYPE_BEACON)) || | ||
558 | dev->wl->radiotap_enabled) { | ||
555 | u16 low_mactime_now; | 559 | u16 low_mactime_now; |
556 | 560 | ||
557 | b43legacy_tsf_read(dev, &status.mactime); | 561 | b43legacy_tsf_read(dev, &status.mactime); |