aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2007-11-23 08:50:51 -0500
committerDavid S. Miller <davem@davemloft.net>2008-01-28 18:04:59 -0500
commitd42ce84a05d7a427df22894de268c1b4473f6004 (patch)
tree412a9ca7dcd91b3e43887f61e2105ebd25f5d83b /drivers/net
parent0b3c07ff6467e6055ca3dd2239494ada96303274 (diff)
b43: include full 64-bit timestamp in monitor mode
When monitor mode is enabled, this will make b43 read out the full 64-bit MAC time from the chip for each received packet. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: Michael Buesch <mb@bu3sch.de> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/wireless/b43/b43.h2
-rw-r--r--drivers/net/wireless/b43/main.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/wireless/b43/b43.h b/drivers/net/wireless/b43/b43.h
index e892ec6f6372..97ea96320c7e 100644
--- a/drivers/net/wireless/b43/b43.h
+++ b/drivers/net/wireless/b43/b43.h
@@ -638,6 +638,8 @@ struct b43_wl {
638 /* List of all wireless devices on this chip */ 638 /* List of all wireless devices on this chip */
639 struct list_head devlist; 639 struct list_head devlist;
640 u8 nr_devs; 640 u8 nr_devs;
641
642 bool radiotap_enabled;
641}; 643};
642 644
643/* Pointers to the firmware data and meta information about it. */ 645/* Pointers to the firmware data and meta information about it. */
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
index 16b413d11d19..58847222cf0b 100644
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -2760,6 +2760,8 @@ static int b43_op_config(struct ieee80211_hw *hw, struct ieee80211_conf *conf)
2760 b43_short_slot_timing_disable(dev); 2760 b43_short_slot_timing_disable(dev);
2761 } 2761 }
2762 2762
2763 dev->wl->radiotap_enabled = !!(conf->flags & IEEE80211_CONF_RADIOTAP);
2764
2763 /* Adjust the desired TX power level. */ 2765 /* Adjust the desired TX power level. */
2764 if (conf->power_level != 0) { 2766 if (conf->power_level != 0) {
2765 if (conf->power_level != phy->power_level) { 2767 if (conf->power_level != phy->power_level) {