mac80211: remove sta_info debugfs sub-struct

Since the previous patch, the struct only has a single member,
so remove the struct and leave just the single member.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/net/mac80211/debugfs_sta.c b/net/mac80211/debugfs_sta.c
index 051b225..af03491 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)
@@ -366,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);
@@ -383,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)
@@ -398,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;
 }

diff --git a/net/mac80211/rate.h b/net/mac80211/rate.h
index 624fe5b..8d32607 100644 (file)
--- a/net/mac80211/rate.h
+++ b/net/mac80211/rate.h
@@ -96,9 +96,9 @@ static inline void rate_control_add_sta_debugfs(struct sta_info *sta)
 {
 #ifdef CONFIG_MAC80211_DEBUGFS
        struct rate_control_ref *ref = sta->rate_ctrl;
-       if (ref && sta->debugfs.dir && ref->ops->add_sta_debugfs)
+       if (ref && sta->debugfs_dir && ref->ops->add_sta_debugfs)
                ref->ops->add_sta_debugfs(ref->priv, sta->rate_ctrl_priv,
-                                         sta->debugfs.dir);
+                                         sta->debugfs_dir);
 #endif
 }
 

diff --git a/net/mac80211/sta_info.h b/net/mac80211/sta_info.h
index 276056e..3b21055 100644 (file)
--- a/net/mac80211/sta_info.h
+++ b/net/mac80211/sta_info.h
@@ -371,7 +371,7 @@ DECLARE_EWMA(signal, 1024, 8)
  * @ampdu_mlme: A-MPDU state machine state
  * @timer_to_tid: identity mapping to ID timers
  * @mesh: mesh STA information
- * @debugfs: debug filesystem info
+ * @debugfs_dir: debug filesystem directory dentry
  * @dead: set to true when sta is unlinked
  * @removed: set to true when sta is being removed from sta_list
  * @uploaded: set to true when sta is uploaded to the driver
@@ -486,9 +486,7 @@ struct sta_info {
        u8 timer_to_tid[IEEE80211_NUM_TIDS];
 
 #ifdef CONFIG_MAC80211_DEBUGFS
-       struct sta_info_debugfsdentries {
-               struct dentry *dir;
-       } debugfs;
+       struct dentry *debugfs_dir;
 #endif
 
        enum ieee80211_sta_rx_bandwidth cur_max_bandwidth;