diff options
Diffstat (limited to 'net/mac80211/debugfs.c')
| -rw-r--r-- | net/mac80211/debugfs.c | 47 | 
1 files changed, 1 insertions, 46 deletions
diff --git a/net/mac80211/debugfs.c b/net/mac80211/debugfs.c index 60514b2c97b..4736c64937b 100644 --- a/net/mac80211/debugfs.c +++ b/net/mac80211/debugfs.c @@ -19,41 +19,6 @@ int mac80211_open_file_generic(struct inode *inode, struct file *file)  	return 0;  } -static const char *ieee80211_mode_str(int mode) -{ -	switch (mode) { -	case MODE_IEEE80211A: -		return "IEEE 802.11a"; -	case MODE_IEEE80211B: -		return "IEEE 802.11b"; -	case MODE_IEEE80211G: -		return "IEEE 802.11g"; -	default: -		return "UNKNOWN"; -	} -} - -static ssize_t modes_read(struct file *file, char __user *userbuf, -			  size_t count, loff_t *ppos) -{ -	struct ieee80211_local *local = file->private_data; -	struct ieee80211_hw_mode *mode; -	char buf[150], *p = buf; - -	/* FIXME: locking! */ -	list_for_each_entry(mode, &local->modes_list, list) { -		p += scnprintf(p, sizeof(buf)+buf-p, -			       "%s\n", ieee80211_mode_str(mode->mode)); -	} - -	return simple_read_from_buffer(userbuf, count, ppos, buf, p-buf); -} - -static const struct file_operations modes_ops = { -	.read = modes_read, -	.open = mac80211_open_file_generic, -}; -  #define DEBUGFS_READONLY_FILE(name, buflen, fmt, value...)		\  static ssize_t name## _read(struct file *file, char __user *userbuf,	\  			    size_t count, loff_t *ppos)			\ @@ -80,10 +45,8 @@ static const struct file_operations name## _ops = {			\  	local->debugfs.name = NULL; -DEBUGFS_READONLY_FILE(channel, 20, "%d", -		      local->hw.conf.channel);  DEBUGFS_READONLY_FILE(frequency, 20, "%d", -		      local->hw.conf.freq); +		      local->hw.conf.channel->center_freq);  DEBUGFS_READONLY_FILE(antenna_sel_tx, 20, "%d",  		      local->hw.conf.antenna_sel_tx);  DEBUGFS_READONLY_FILE(antenna_sel_rx, 20, "%d", @@ -100,8 +63,6 @@ DEBUGFS_READONLY_FILE(long_retry_limit, 20, "%d",  		      local->long_retry_limit);  DEBUGFS_READONLY_FILE(total_ps_buffered, 20, "%d",  		      local->total_ps_buffered); -DEBUGFS_READONLY_FILE(mode, 20, "%s", -		      ieee80211_mode_str(local->hw.conf.phymode));  DEBUGFS_READONLY_FILE(wep_iv, 20, "%#06x",  		      local->wep_iv & 0xffffff);  DEBUGFS_READONLY_FILE(rate_ctrl_alg, 100, "%s", @@ -294,7 +255,6 @@ void debugfs_hw_add(struct ieee80211_local *local)  	local->debugfs.stations = debugfs_create_dir("stations", phyd);  	local->debugfs.keys = debugfs_create_dir("keys", phyd); -	DEBUGFS_ADD(channel);  	DEBUGFS_ADD(frequency);  	DEBUGFS_ADD(antenna_sel_tx);  	DEBUGFS_ADD(antenna_sel_rx); @@ -304,9 +264,7 @@ void debugfs_hw_add(struct ieee80211_local *local)  	DEBUGFS_ADD(short_retry_limit);  	DEBUGFS_ADD(long_retry_limit);  	DEBUGFS_ADD(total_ps_buffered); -	DEBUGFS_ADD(mode);  	DEBUGFS_ADD(wep_iv); -	DEBUGFS_ADD(modes);  	statsd = debugfs_create_dir("statistics", phyd);  	local->debugfs.statistics = statsd; @@ -356,7 +314,6 @@ void debugfs_hw_add(struct ieee80211_local *local)  void debugfs_hw_del(struct ieee80211_local *local)  { -	DEBUGFS_DEL(channel);  	DEBUGFS_DEL(frequency);  	DEBUGFS_DEL(antenna_sel_tx);  	DEBUGFS_DEL(antenna_sel_rx); @@ -366,9 +323,7 @@ void debugfs_hw_del(struct ieee80211_local *local)  	DEBUGFS_DEL(short_retry_limit);  	DEBUGFS_DEL(long_retry_limit);  	DEBUGFS_DEL(total_ps_buffered); -	DEBUGFS_DEL(mode);  	DEBUGFS_DEL(wep_iv); -	DEBUGFS_DEL(modes);  	DEBUGFS_STATS_DEL(transmitted_fragment_count);  	DEBUGFS_STATS_DEL(multicast_transmitted_frame_count);  |