mac80211: remove sta_info debugfs sub-struct

[linux-2.6-block.git] / net / mac80211 / debugfs_sta.c

diff --git a/net/mac80211/debugfs_sta.c b/net/mac80211/debugfs_sta.c
index fbbd66c9ca51c9068d3b8a60c3c79ca8fd6eacdb..af034912abbe7f7d3d0d1bbaae555cb6d94c8f06 100644 (file)
--- a/net/mac80211/debugfs_sta.c
+++ b/net/mac80211/debugfs_sta.c
@@ -335,14 +335,14 @@ STA_OPS(vht_capa);
 
 #define DEBUGFS_ADD(name) \
        debugfs_create_file(#name, 0400, \
-               sta->debugfs.dir, sta, &sta_ ##name## _ops);
+               sta->debugfs_dir, sta, &sta_ ##name## _ops);
 
 #define DEBUGFS_ADD_COUNTER(name, field)                               \
        if (sizeof(sta->field) == sizeof(u32))                          \
-               debugfs_create_u32(#name, 0400, sta->debugfs.dir,       \
+               debugfs_create_u32(#name, 0400, sta->debugfs_dir,       \
                        (u32 *) &sta->field);                           \
        else                                                            \
-               debugfs_create_u64(#name, 0400, sta->debugfs.dir,       \
+               debugfs_create_u64(#name, 0400, sta->debugfs_dir,       \
                        (u64 *) &sta->field);
 
 void ieee80211_sta_debugfs_add(struct sta_info *sta)
@@ -352,8 +352,6 @@ void ieee80211_sta_debugfs_add(struct sta_info *sta)
        struct dentry *stations_dir = sta->sdata->debugfs.subdir_stations;
        u8 mac[3*ETH_ALEN];
 
-       sta->debugfs.add_has_run = true;
-
        if (!stations_dir)
                return;
 
@@ -368,8 +366,8 @@ void ieee80211_sta_debugfs_add(struct sta_info *sta)
         * destroyed quickly enough the old station's debugfs
         * dir might still be around.
         */
-       sta->debugfs.dir = debugfs_create_dir(mac, stations_dir);
-       if (!sta->debugfs.dir)
+       sta->debugfs_dir = debugfs_create_dir(mac, stations_dir);
+       if (!sta->debugfs_dir)
                return;
 
        DEBUGFS_ADD(flags);
@@ -385,14 +383,14 @@ void ieee80211_sta_debugfs_add(struct sta_info *sta)
 
        if (sizeof(sta->driver_buffered_tids) == sizeof(u32))
                debugfs_create_x32("driver_buffered_tids", 0400,
-                                  sta->debugfs.dir,
+                                  sta->debugfs_dir,
                                   (u32 *)&sta->driver_buffered_tids);
        else
                debugfs_create_x64("driver_buffered_tids", 0400,
-                                  sta->debugfs.dir,
+                                  sta->debugfs_dir,
                                   (u64 *)&sta->driver_buffered_tids);
 
-       drv_sta_add_debugfs(local, sdata, &sta->sta, sta->debugfs.dir);
+       drv_sta_add_debugfs(local, sdata, &sta->sta, sta->debugfs_dir);
 }
 
 void ieee80211_sta_debugfs_remove(struct sta_info *sta)
@@ -400,7 +398,7 @@ void ieee80211_sta_debugfs_remove(struct sta_info *sta)
        struct ieee80211_local *local = sta->local;
        struct ieee80211_sub_if_data *sdata = sta->sdata;
 
-       drv_sta_remove_debugfs(local, sdata, &sta->sta, sta->debugfs.dir);
-       debugfs_remove_recursive(sta->debugfs.dir);
-       sta->debugfs.dir = NULL;
+       drv_sta_remove_debugfs(local, sdata, &sta->sta, sta->debugfs_dir);
+       debugfs_remove_recursive(sta->debugfs_dir);
+       sta->debugfs_dir = NULL;
 }