b43: Accessing the TSF via mac80211

This allows the mac80211 high level code to access the TSF. This is e.g. needed for BSSID merges in the IBSS mode.

The second version adds locking and removes the now unnecessary debugfs entries.

Thanks to Michael Buesch! :)

Signed-off-by: Alina Friedrichsen <x-alina@gmx.net>
Signed-off-by: Michael Buesch <mb@bu3sch.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 39 insertions, 0 deletions

diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
index cbb3d45f6fc9..e41c10fd31d3 100644
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -3245,6 +3245,43 @@ static int b43_op_get_stats(struct ieee80211_hw *hw,
         return 0;
 }
 
+static u64 b43_op_get_tsf(struct ieee80211_hw *hw)
+{
+        struct b43_wl *wl = hw_to_b43_wl(hw);
+        struct b43_wldev *dev;
+        u64 tsf;
+
+        mutex_lock(&wl->mutex);
+        spin_lock_irq(&wl->irq_lock);
+        dev = wl->current_dev;
+
+        if (dev && (b43_status(dev) >= B43_STAT_INITIALIZED))
+                b43_tsf_read(dev, &tsf);
+        else
+                tsf = 0;
+
+        spin_unlock_irq(&wl->irq_lock);
+        mutex_unlock(&wl->mutex);
+
+        return tsf;
+}
+
+static void b43_op_set_tsf(struct ieee80211_hw *hw, u64 tsf)
+{
+        struct b43_wl *wl = hw_to_b43_wl(hw);
+        struct b43_wldev *dev;
+
+        mutex_lock(&wl->mutex);
+        spin_lock_irq(&wl->irq_lock);
+        dev = wl->current_dev;
+
+        if (dev && (b43_status(dev) >= B43_STAT_INITIALIZED))
+                b43_tsf_write(dev, tsf);
+
+        spin_unlock_irq(&wl->irq_lock);
+        mutex_unlock(&wl->mutex);
+}
+
 static void b43_put_phy_into_reset(struct b43_wldev *dev)
 {
         struct ssb_device *sdev = dev->dev;
@@ -4364,6 +4401,8 @@ static const struct ieee80211_ops b43_hw_ops = {
         .set_key                = b43_op_set_key,
         .get_stats              = b43_op_get_stats,
         .get_tx_stats           = b43_op_get_tx_stats,
+        .get_tsf                = b43_op_get_tsf,
+        .set_tsf                = b43_op_set_tsf,
         .start                  = b43_op_start,
         .stop                   = b43_op_stop,
         .set_tim                = b43_op_beacon_set_tim,