mac80211: Generic TSF debugging

This patch enables low-level driver independent debugging of the TSF and remove the driver specific things of ath5k and ath9k from the debugfs.

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

3 files changed, 9 insertions, 49 deletions

diff --git a/drivers/net/wireless/ath9k/core.h b/drivers/net/wireless/ath9k/core.h
index acbd8881ef83..29251f8dabb0 100644
--- a/drivers/net/wireless/ath9k/core.h
+++ b/drivers/net/wireless/ath9k/core.h
@@ -141,7 +141,6 @@ struct ath9k_debug {
         struct dentry *debugfs_phy;
         struct dentry *debugfs_dma;
         struct dentry *debugfs_interrupt;
-        struct dentry *debugfs_tsf;
         struct ath_stats stats;
 };
 
diff --git a/drivers/net/wireless/ath9k/debug.c b/drivers/net/wireless/ath9k/debug.c
index 05e1f82cc7a1..1680164b4adb 100644
--- a/drivers/net/wireless/ath9k/debug.c
+++ b/drivers/net/wireless/ath9k/debug.c
@@ -223,48 +223,6 @@ static const struct file_operations fops_interrupt = {
 };
 
 
-static ssize_t read_file_tsf(struct file *file, char __user *user_buf,
-                             size_t count, loff_t *ppos)
-{
-        struct ath_softc *sc = file->private_data;
-        char buf[100];
-        snprintf(buf, sizeof(buf), "0x%016llx\n",
-                 (unsigned long long)ath9k_hw_gettsf64(sc->sc_ah));
-        return simple_read_from_buffer(user_buf, count, ppos, buf, 19);
-}
-
-static ssize_t write_file_tsf(struct file *file,
-                              const char __user *user_buf,
-                              size_t count, loff_t *ppos)
-{
-        struct ath_softc *sc = file->private_data;
-        char buf[21];
-        unsigned long long tsf;
-
-        if (copy_from_user(buf, user_buf, min(count, sizeof(buf) - 1)))
-                return -EFAULT;
-        buf[sizeof(buf) - 1] = '\0';
-
-        if (strncmp(buf, "reset", 5) == 0) {
-                ath9k_hw_reset_tsf(sc->sc_ah);
-                printk(KERN_INFO "debugfs reset TSF\n");
-        } else {
-                tsf = simple_strtoul(buf, NULL, 0);
-                ath9k_hw_settsf64(sc->sc_ah, tsf);
-                printk(KERN_INFO "debugfs set TSF to %#018llx\n", tsf);
-        }
-
-        return count;
-}
-
-static const struct file_operations fops_tsf = {
-        .read = read_file_tsf,
-        .write = write_file_tsf,
-        .open = ath9k_debugfs_open,
-        .owner = THIS_MODULE
-};
-
-
 int ath9k_init_debug(struct ath_softc *sc)
 {
         sc->sc_debug.debug_mask = ath9k_debug;
@@ -290,11 +248,6 @@ int ath9k_init_debug(struct ath_softc *sc)
         if (!sc->sc_debug.debugfs_interrupt)
                 goto err;
 
-        sc->sc_debug.debugfs_tsf = debugfs_create_file("tsf", S_IRUGO,
-                                       sc->sc_debug.debugfs_phy, sc, &fops_tsf);
-        if (!sc->sc_debug.debugfs_tsf)
-                goto err;
-
         return 0;
 err:
         ath9k_exit_debug(sc);
@@ -303,7 +256,6 @@ err:
 
 void ath9k_exit_debug(struct ath_softc *sc)
 {
-        debugfs_remove(sc->sc_debug.debugfs_tsf);
         debugfs_remove(sc->sc_debug.debugfs_interrupt);
         debugfs_remove(sc->sc_debug.debugfs_dma);
         debugfs_remove(sc->sc_debug.debugfs_phy);
diff --git a/drivers/net/wireless/ath9k/main.c b/drivers/net/wireless/ath9k/main.c
index 15a7f90bc84b..90e687b5a8b7 100644
--- a/drivers/net/wireless/ath9k/main.c
+++ b/drivers/net/wireless/ath9k/main.c
@@ -2451,6 +2451,14 @@ static u64 ath9k_get_tsf(struct ieee80211_hw *hw)
         return tsf;
 }
 
+static void ath9k_set_tsf(struct ieee80211_hw *hw, u64 tsf)
+{
+        struct ath_softc *sc = hw->priv;
+        struct ath_hal *ah = sc->sc_ah;
+
+        ath9k_hw_settsf64(ah, tsf);
+}
+
 static void ath9k_reset_tsf(struct ieee80211_hw *hw)
 {
         struct ath_softc *sc = hw->priv;
@@ -2514,6 +2522,7 @@ struct ieee80211_ops ath9k_ops = {
         .bss_info_changed   = ath9k_bss_info_changed,
         .set_key            = ath9k_set_key,
         .get_tsf            = ath9k_get_tsf,
+        .set_tsf            = ath9k_set_tsf,
         .reset_tsf          = ath9k_reset_tsf,
         .ampdu_action       = ath9k_ampdu_action,
 };