aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2007-11-24 15:11:09 -0500
committerDavid S. Miller <davem@davemloft.net>2008-01-28 18:05:03 -0500
commit5be3bda8987b12a87863c89b74b136fdb1f072db (patch)
tree4ef071fa29592e91762e9f5f6299956a69cb8170 /drivers/net
parent125c5cc2c8c1fab6a6a1d8a07f7073b240e6d325 (diff)
b43legacy: include full 64-bit timestamp in monitor mode
When monitor mode is enabled, this will make b43legacy read out the full 64-bit MAC time from the chip for each received packet. This patch has been ported from b43. Signed-off-by: Stefano Brivio <stefano.brivio@polimi.it> Cc: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/wireless/b43legacy/b43legacy.h2
-rw-r--r--drivers/net/wireless/b43legacy/main.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/wireless/b43legacy/b43legacy.h b/drivers/net/wireless/b43legacy/b43legacy.h
index fe2af06f5599..d906f6eb2020 100644
--- a/drivers/net/wireless/b43legacy/b43legacy.h
+++ b/drivers/net/wireless/b43legacy/b43legacy.h
@@ -599,6 +599,8 @@ struct b43legacy_wl {
599 /* List of all wireless devices on this chip */ 599 /* List of all wireless devices on this chip */
600 struct list_head devlist; 600 struct list_head devlist;
601 u8 nr_devs; 601 u8 nr_devs;
602
603 bool radiotap_enabled;
602}; 604};
603 605
604/* Pointers to the firmware data and meta information about it. */ 606/* Pointers to the firmware data and meta information about it. */
diff --git a/drivers/net/wireless/b43legacy/main.c b/drivers/net/wireless/b43legacy/main.c
index 1a8b67619077..92c03b0336a4 100644
--- a/drivers/net/wireless/b43legacy/main.c
+++ b/drivers/net/wireless/b43legacy/main.c
@@ -2553,6 +2553,8 @@ static int b43legacy_op_dev_config(struct ieee80211_hw *hw,
2553 b43legacy_short_slot_timing_disable(dev); 2553 b43legacy_short_slot_timing_disable(dev);
2554 } 2554 }
2555 2555
2556 dev->wl->radiotap_enabled = !!(conf->flags & IEEE80211_CONF_RADIOTAP);
2557
2556 /* Adjust the desired TX power level. */ 2558 /* Adjust the desired TX power level. */
2557 if (conf->power_level != 0) { 2559 if (conf->power_level != 0) {
2558 if (conf->power_level != phy->power_level) { 2560 if (conf->power_level != phy->power_level) {