diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2010-06-02 02:57:34 +0200 | 
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-06-03 14:14:41 -0400 | 
| commit | 2826bcd844e05dcbef9b9284bddb7fe88e8d314f (patch) | |
| tree | a95085b75ba4299c77571e024e37e84da54f9db3 /net/mac80211/debugfs_sta.c | |
| parent | 84642d6bdde9164b7905fba03c0691a806788e0c (diff) | |
| download | olio-linux-3.10-2826bcd844e05dcbef9b9284bddb7fe88e8d314f.tar.xz olio-linux-3.10-2826bcd844e05dcbef9b9284bddb7fe88e8d314f.zip  | |
mac80211: reduce debugfs code size
This patch reduces the binary size by around 25k (measured on MIPS,
with CONFIG_MAC80211_DEBUG_COUNTERS enabled).
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/debugfs_sta.c')
| -rw-r--r-- | net/mac80211/debugfs_sta.c | 45 | 
1 files changed, 20 insertions, 25 deletions
diff --git a/net/mac80211/debugfs_sta.c b/net/mac80211/debugfs_sta.c index 9f140612224..576e024715e 100644 --- a/net/mac80211/debugfs_sta.c +++ b/net/mac80211/debugfs_sta.c @@ -30,7 +30,6 @@ static ssize_t sta_ ##name## _read(struct file *file,			\  }  #define STA_READ_D(name, field) STA_READ(name, 20, field, "%d\n")  #define STA_READ_U(name, field) STA_READ(name, 20, field, "%u\n") -#define STA_READ_LU(name, field) STA_READ(name, 20, field, "%lu\n")  #define STA_READ_S(name, field) STA_READ(name, 20, field, "%s\n")  #define STA_OPS(name)							\ @@ -52,19 +51,7 @@ static const struct file_operations sta_ ##name## _ops = {		\  STA_FILE(aid, sta.aid, D);  STA_FILE(dev, sdata->name, S); -STA_FILE(rx_packets, rx_packets, LU); -STA_FILE(tx_packets, tx_packets, LU); -STA_FILE(rx_bytes, rx_bytes, LU); -STA_FILE(tx_bytes, tx_bytes, LU); -STA_FILE(rx_duplicates, num_duplicates, LU); -STA_FILE(rx_fragments, rx_fragments, LU); -STA_FILE(rx_dropped, rx_dropped, LU); -STA_FILE(tx_fragments, tx_fragments, LU); -STA_FILE(tx_filtered, tx_filtered_count, LU); -STA_FILE(tx_retry_failed, tx_retry_failed, LU); -STA_FILE(tx_retry_count, tx_retry_count, LU);  STA_FILE(last_signal, last_signal, D); -STA_FILE(wep_weak_iv_count, wep_weak_iv_count, LU);  static ssize_t sta_flags_read(struct file *file, char __user *userbuf,  			      size_t count, loff_t *ppos) @@ -306,6 +293,13 @@ STA_OPS(ht_capa);  	debugfs_create_file(#name, 0400, \  		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,	\ +			(u32 *) &sta->field);				\ +	else								\ +		debugfs_create_u64(#name, 0400, sta->debugfs.dir,	\ +			(u64 *) &sta->field);  void ieee80211_sta_debugfs_add(struct sta_info *sta)  { @@ -338,20 +332,21 @@ void ieee80211_sta_debugfs_add(struct sta_info *sta)  	DEBUGFS_ADD(last_seq_ctrl);  	DEBUGFS_ADD(agg_status);  	DEBUGFS_ADD(dev); -	DEBUGFS_ADD(rx_packets); -	DEBUGFS_ADD(tx_packets); -	DEBUGFS_ADD(rx_bytes); -	DEBUGFS_ADD(tx_bytes); -	DEBUGFS_ADD(rx_duplicates); -	DEBUGFS_ADD(rx_fragments); -	DEBUGFS_ADD(rx_dropped); -	DEBUGFS_ADD(tx_fragments); -	DEBUGFS_ADD(tx_filtered); -	DEBUGFS_ADD(tx_retry_failed); -	DEBUGFS_ADD(tx_retry_count);  	DEBUGFS_ADD(last_signal); -	DEBUGFS_ADD(wep_weak_iv_count);  	DEBUGFS_ADD(ht_capa); + +	DEBUGFS_ADD_COUNTER(rx_packets, rx_packets); +	DEBUGFS_ADD_COUNTER(tx_packets, tx_packets); +	DEBUGFS_ADD_COUNTER(rx_bytes, rx_bytes); +	DEBUGFS_ADD_COUNTER(tx_bytes, tx_bytes); +	DEBUGFS_ADD_COUNTER(rx_duplicates, num_duplicates); +	DEBUGFS_ADD_COUNTER(rx_fragments, rx_fragments); +	DEBUGFS_ADD_COUNTER(rx_dropped, rx_dropped); +	DEBUGFS_ADD_COUNTER(tx_fragments, tx_fragments); +	DEBUGFS_ADD_COUNTER(tx_filtered, tx_filtered_count); +	DEBUGFS_ADD_COUNTER(tx_retry_failed, tx_retry_failed); +	DEBUGFS_ADD_COUNTER(tx_retry_count, tx_retry_count); +	DEBUGFS_ADD_COUNTER(wep_weak_iv_count, wep_weak_iv_count);  }  void ieee80211_sta_debugfs_remove(struct sta_info *sta)  |