hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Johannes Berg 2016-04-05 11:59:05 +02:00
parent 96f321c9d4
commit fc4a25c5b7
3 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
net/mac80211/debugfs_sta.c
View File

@ -335,14 +335,14 @@ STA_OPS(vht_capa);
#define DEBUGFS_ADD(name) \ #define DEBUGFS_ADD(name) \
debugfs_create_file(#name, 0400, \ 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) \ #define DEBUGFS_ADD_COUNTER(name, field) \
if (sizeof(sta->field) == sizeof(u32)) \ 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); \ (u32 *) &sta->field); \
else \ else \
debugfs_create_u64(#name, 0400, sta->debugfs.dir, \ debugfs_create_u64(#name, 0400, sta->debugfs_dir, \
(u64 *) &sta->field); (u64 *) &sta->field);
void ieee80211_sta_debugfs_add(struct sta_info *sta) 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 * destroyed quickly enough the old station's debugfs
* dir might still be around. * dir might still be around.
*/ */
sta->debugfs.dir = debugfs_create_dir(mac, stations_dir); sta->debugfs_dir = debugfs_create_dir(mac, stations_dir);
if (!sta->debugfs.dir) if (!sta->debugfs_dir)
return; return;
DEBUGFS_ADD(flags); DEBUGFS_ADD(flags);
@ -383,14 +383,14 @@ void ieee80211_sta_debugfs_add(struct sta_info *sta)
if (sizeof(sta->driver_buffered_tids) == sizeof(u32)) if (sizeof(sta->driver_buffered_tids) == sizeof(u32))
debugfs_create_x32("driver_buffered_tids", 0400, debugfs_create_x32("driver_buffered_tids", 0400,
sta->debugfs.dir, sta->debugfs_dir,
(u32 *)&sta->driver_buffered_tids); (u32 *)&sta->driver_buffered_tids);
else else
debugfs_create_x64("driver_buffered_tids", 0400, debugfs_create_x64("driver_buffered_tids", 0400,
sta->debugfs.dir, sta->debugfs_dir,
(u64 *)&sta->driver_buffered_tids); (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) 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_local *local = sta->local;
struct ieee80211_sub_if_data *sdata = sta->sdata; struct ieee80211_sub_if_data *sdata = sta->sdata;
drv_sta_remove_debugfs(local, sdata, &sta->sta, sta->debugfs.dir); drv_sta_remove_debugfs(local, sdata, &sta->sta, sta->debugfs_dir);
debugfs_remove_recursive(sta->debugfs.dir); debugfs_remove_recursive(sta->debugfs_dir);
sta->debugfs.dir = NULL; sta->debugfs_dir = NULL;
} }

4
net/mac80211/rate.h
View File

@ -96,9 +96,9 @@ static inline void rate_control_add_sta_debugfs(struct sta_info *sta)
{ {
#ifdef CONFIG_MAC80211_DEBUGFS #ifdef CONFIG_MAC80211_DEBUGFS
struct rate_control_ref *ref = sta->rate_ctrl; 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, ref->ops->add_sta_debugfs(ref->priv, sta->rate_ctrl_priv,
sta->debugfs.dir); sta->debugfs_dir);
#endif #endif
} }

6
net/mac80211/sta_info.h
View File

@ -371,7 +371,7 @@ DECLARE_EWMA(signal, 1024, 8)
* @ampdu_mlme: A-MPDU state machine state * @ampdu_mlme: A-MPDU state machine state
* @timer_to_tid: identity mapping to ID timers * @timer_to_tid: identity mapping to ID timers
* @mesh: mesh STA information * @mesh: mesh STA information
* @debugfs: debug filesystem info * @debugfs_dir: debug filesystem directory dentry
* @dead: set to true when sta is unlinked * @dead: set to true when sta is unlinked
* @removed: set to true when sta is being removed from sta_list * @removed: set to true when sta is being removed from sta_list
* @uploaded: set to true when sta is uploaded to the driver * @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]; u8 timer_to_tid[IEEE80211_NUM_TIDS];
#ifdef CONFIG_MAC80211_DEBUGFS #ifdef CONFIG_MAC80211_DEBUGFS
struct sta_info_debugfsdentries { struct dentry *debugfs_dir;
struct dentry *dir;
} debugfs;
#endif #endif
enum ieee80211_sta_rx_bandwidth cur_max_bandwidth; enum ieee80211_sta_rx_bandwidth cur_max_bandwidth;