wireless: cleanup some merge errors

Signed-off-by: John W. Linville <linville@tuxdriver.com>

2 files changed, 36 insertions, 4 deletions

diff --git a/drivers/net/wireless/b43/xmit.c b/drivers/net/wireless/b43/xmit.c
index a455a6beac4a..e60e54d59ab1 100644
--- a/drivers/net/wireless/b43/xmit.c
+++ b/drivers/net/wireless/b43/xmit.c
@@ -525,8 +525,24 @@ void b43_rx(struct b43_wldev *dev, struct sk_buff *skb, const void *_rxhdr)
         else
                 status.rate = b43_plcp_get_bitrate_cck(plcp);
         status.antenna = !!(phystat0 & B43_RX_PHYST0_ANT);
-        status.mactime = mactime;
-        status.flag |= RX_FLAG_TSFT;
+
+        /*
+         * 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.
+         */
+        if (dev->wl->radiotap_enabled) {
+                u16 low_mactime_now;
+
+                b43_tsf_read(dev, &status.mactime);
+                low_mactime_now = status.mactime;
+                status.mactime = status.mactime & ~0xFFFFULL;
+                status.mactime += mactime;
+                if (low_mactime_now <= mactime)
+                        status.mactime -= 0x10000;
+                status.flag |= RX_FLAG_TSFT;
+        }
 
         chanid = (chanstat & B43_RX_CHAN_ID) >> B43_RX_CHAN_ID_SHIFT;
         switch (chanstat & B43_RX_CHAN_PHYTYPE) {
diff --git a/drivers/net/wireless/b43legacy/xmit.c b/drivers/net/wireless/b43legacy/xmit.c
index c24399dc0ede..fa095d43237f 100644
--- a/drivers/net/wireless/b43legacy/xmit.c
+++ b/drivers/net/wireless/b43legacy/xmit.c
@@ -532,8 +532,24 @@ void b43legacy_rx(struct b43legacy_wldev *dev,
         else
                 status.rate = b43legacy_plcp_get_bitrate_cck(plcp);
         status.antenna = !!(phystat0 & B43legacy_RX_PHYST0_ANT);
-        status.mactime = mactime;
-        status.flag |= RX_FLAG_TSFT;
+
+        /*
+         * 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.
+         */
+        if (dev->wl->radiotap_enabled) {
+                u16 low_mactime_now;
+
+                b43legacy_tsf_read(dev, &status.mactime);
+                low_mactime_now = status.mactime;
+                status.mactime = status.mactime & ~0xFFFFULL;
+                status.mactime += mactime;
+                if (low_mactime_now <= mactime)
+                        status.mactime -= 0x10000;
+                status.flag |= RX_FLAG_TSFT;
+        }
 
         chanid = (chanstat & B43legacy_RX_CHAN_ID) >>
                   B43legacy_RX_CHAN_ID_SHIFT;