Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1ac61302 authored by Luis R. Rodriguez's avatar Luis R. Rodriguez Committed by John W. Linville
Browse files

mac80211/cfg80211: move wiphy specific debugfs entries to cfg80211 



This moves the cfg80211 specific stuff to new cfg80211 debugfs
entries. Non-mac80211 will also get these entries now. There were
only 4 which we take:

rts_threshold
fragmentation_threshold
short_retry_limit
long_retry_limit

Signed-off-by: default avatarLuis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 294196ab

net/mac80211/debugfs.c

+0 −16
Original line number Diff line number Diff line
@@ -52,14 +52,6 @@ static const struct file_operations name## _ops = { \ 


DEBUGFS_READONLY_FILE(frequency, 20, "%d",

		      local->hw.conf.channel->center_freq);

DEBUGFS_READONLY_FILE(rts_threshold, 20, "%d",

		      local->hw.wiphy->rts_threshold);

DEBUGFS_READONLY_FILE(fragmentation_threshold, 20, "%d",

		      local->hw.wiphy->frag_threshold);

DEBUGFS_READONLY_FILE(short_retry_limit, 20, "%d",

		      local->hw.wiphy->retry_short);

DEBUGFS_READONLY_FILE(long_retry_limit, 20, "%d",

		      local->hw.wiphy->retry_long);

DEBUGFS_READONLY_FILE(total_ps_buffered, 20, "%d",

		      local->total_ps_buffered);

DEBUGFS_READONLY_FILE(wep_iv, 20, "%#08x",
@@ -303,10 +295,6 @@ void debugfs_hw_add(struct ieee80211_local *local) 
	local->debugfs.keys = debugfs_create_dir("keys", phyd);



	DEBUGFS_ADD(frequency);

	DEBUGFS_ADD(rts_threshold);

	DEBUGFS_ADD(fragmentation_threshold);

	DEBUGFS_ADD(short_retry_limit);

	DEBUGFS_ADD(long_retry_limit);

	DEBUGFS_ADD(total_ps_buffered);

	DEBUGFS_ADD(wep_iv);

	DEBUGFS_ADD(tsf);
@@ -359,10 +347,6 @@ void debugfs_hw_add(struct ieee80211_local *local) 
void debugfs_hw_del(struct ieee80211_local *local)

{

	DEBUGFS_DEL(frequency);

	DEBUGFS_DEL(rts_threshold);

	DEBUGFS_DEL(fragmentation_threshold);

	DEBUGFS_DEL(short_retry_limit);

	DEBUGFS_DEL(long_retry_limit);

	DEBUGFS_DEL(total_ps_buffered);

	DEBUGFS_DEL(wep_iv);

	DEBUGFS_DEL(tsf);

net/mac80211/ieee80211_i.h

+0 −4
Original line number Diff line number Diff line
@@ -758,10 +758,6 @@ struct ieee80211_local { 
		struct dentry *rcdir;

		struct dentry *rcname;

		struct dentry *frequency;

		struct dentry *rts_threshold;

		struct dentry *fragmentation_threshold;

		struct dentry *short_retry_limit;

		struct dentry *long_retry_limit;

		struct dentry *total_ps_buffered;

		struct dentry *wep_iv;

		struct dentry *tsf;

net/wireless/Kconfig

+8 −0
Original line number Diff line number Diff line
@@ -10,6 +10,14 @@ config CFG80211_REG_DEBUG 


	  If unsure, say N.



config CFG80211_DEBUGFS

	bool "cfg80211 DebugFS entries"

	depends on CFG80211 && DEBUG_FS

	---help---

	  You can enable this if you want to debugfs entries for cfg80211.



	  If unsure, say N.



config WIRELESS_OLD_REGULATORY

	bool "Old wireless static regulatory definitions"

	default n

net/wireless/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ obj-$(CONFIG_LIB80211_CRYPT_CCMP) += lib80211_crypt_ccmp.o 
obj-$(CONFIG_LIB80211_CRYPT_TKIP) += lib80211_crypt_tkip.o



cfg80211-y += core.o sysfs.o radiotap.o util.o reg.o scan.o nl80211.o mlme.o ibss.o

cfg80211-$(CONFIG_CFG80211_DEBUGFS) += debugfs.o

cfg80211-$(CONFIG_WIRELESS_EXT) += wext-compat.o



ccflags-y += -D__CHECK_ENDIAN__

net/wireless/core.c

+5 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include "nl80211.h"

#include "core.h"

#include "sysfs.h"

#include "debugfs.h"



/* name for sysfs, %d is appended */

#define PHY_NAME "phy"
@@ -375,6 +376,8 @@ int wiphy_register(struct wiphy *wiphy) 
		nl80211_send_reg_change_event(&request);

	}



	cfg80211_debugfs_drv_add(drv);



	res = 0;

out_unlock:

	mutex_unlock(&cfg80211_mutex);
@@ -405,6 +408,8 @@ void wiphy_unregister(struct wiphy *wiphy) 
	/* unlock again before freeing */

	mutex_unlock(&drv->mtx);



	cfg80211_debugfs_drv_del(drv);



	/* If this device got a regulatory hint tell core its

	 * free to listen now to a new shiny device regulatory hint */

	reg_device_remove(wiphy);