diff options
author | Felix Fietkau <nbd@openwrt.org> | 2012-03-10 12:59:40 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2012-03-10 12:59:40 +0000 |
commit | 1d62a5378117da1a3346bf100f0a7e54d0546632 (patch) | |
tree | 5e6fbb34a22fb5312dfbb10488b1e3092708cf3a /package/mac80211/patches/562-mac80211_remove_code_duplication.patch | |
parent | 92444e39587ef8cac2ec08367510c3a3fd426bf8 (diff) | |
download | upstream-1d62a5378117da1a3346bf100f0a7e54d0546632.tar.gz upstream-1d62a5378117da1a3346bf100f0a7e54d0546632.tar.bz2 upstream-1d62a5378117da1a3346bf100f0a7e54d0546632.zip |
mac80211/ath9k: some more performance improvements
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@30866 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211/patches/562-mac80211_remove_code_duplication.patch')
-rw-r--r-- | package/mac80211/patches/562-mac80211_remove_code_duplication.patch | 127 |
1 files changed, 127 insertions, 0 deletions
diff --git a/package/mac80211/patches/562-mac80211_remove_code_duplication.patch b/package/mac80211/patches/562-mac80211_remove_code_duplication.patch new file mode 100644 index 0000000000..e411d766c0 --- /dev/null +++ b/package/mac80211/patches/562-mac80211_remove_code_duplication.patch @@ -0,0 +1,127 @@ +--- a/net/mac80211/debugfs_netdev.c ++++ b/net/mac80211/debugfs_netdev.c +@@ -445,26 +445,23 @@ IEEE80211_IF_FILE(dot11MeshHWMPRannInter + IEEE80211_IF_FILE(dot11MeshForwarding, u.mesh.mshcfg.dot11MeshForwarding, DEC); + #endif + +- +-#define DEBUGFS_ADD(name) \ +- debugfs_create_file(#name, 0400, sdata->debugfs.dir, \ +- sdata, &name##_ops); +- + #define DEBUGFS_ADD_MODE(name, mode) \ + debugfs_create_file(#name, mode, sdata->debugfs.dir, \ + sdata, &name##_ops); + +-static void add_sta_files(struct ieee80211_sub_if_data *sdata) ++#define DEBUGFS_ADD(name) DEBUGFS_ADD_MODE(name, 0400) ++ ++static void add_common_files(struct ieee80211_sub_if_data *sdata) + { + DEBUGFS_ADD(drop_unencrypted); +- DEBUGFS_ADD(flags); +- DEBUGFS_ADD(state); +- DEBUGFS_ADD(channel_type); + DEBUGFS_ADD(rc_rateidx_mask_2ghz); + DEBUGFS_ADD(rc_rateidx_mask_5ghz); + DEBUGFS_ADD(rc_rateidx_mcs_mask_2ghz); + DEBUGFS_ADD(rc_rateidx_mcs_mask_5ghz); ++} + ++static void add_sta_files(struct ieee80211_sub_if_data *sdata) ++{ + DEBUGFS_ADD(bssid); + DEBUGFS_ADD(aid); + DEBUGFS_ADD(last_beacon); +@@ -475,15 +472,6 @@ static void add_sta_files(struct ieee802 + + static void add_ap_files(struct ieee80211_sub_if_data *sdata) + { +- DEBUGFS_ADD(drop_unencrypted); +- DEBUGFS_ADD(flags); +- DEBUGFS_ADD(state); +- DEBUGFS_ADD(channel_type); +- DEBUGFS_ADD(rc_rateidx_mask_2ghz); +- DEBUGFS_ADD(rc_rateidx_mask_5ghz); +- DEBUGFS_ADD(rc_rateidx_mcs_mask_2ghz); +- DEBUGFS_ADD(rc_rateidx_mcs_mask_5ghz); +- + DEBUGFS_ADD(num_sta_authorized); + DEBUGFS_ADD(num_sta_ps); + DEBUGFS_ADD(dtim_count); +@@ -493,48 +481,14 @@ static void add_ap_files(struct ieee8021 + + static void add_ibss_files(struct ieee80211_sub_if_data *sdata) + { +- DEBUGFS_ADD(channel_type); +- DEBUGFS_ADD(rc_rateidx_mask_2ghz); +- DEBUGFS_ADD(rc_rateidx_mask_5ghz); +- DEBUGFS_ADD(rc_rateidx_mcs_mask_2ghz); +- DEBUGFS_ADD(rc_rateidx_mcs_mask_5ghz); +- + DEBUGFS_ADD_MODE(tsf, 0600); + } + + static void add_wds_files(struct ieee80211_sub_if_data *sdata) + { +- DEBUGFS_ADD(drop_unencrypted); +- DEBUGFS_ADD(flags); +- DEBUGFS_ADD(state); +- DEBUGFS_ADD(channel_type); +- DEBUGFS_ADD(rc_rateidx_mask_2ghz); +- DEBUGFS_ADD(rc_rateidx_mask_5ghz); +- DEBUGFS_ADD(rc_rateidx_mcs_mask_2ghz); +- DEBUGFS_ADD(rc_rateidx_mcs_mask_5ghz); +- + DEBUGFS_ADD(peer); + } + +-static void add_vlan_files(struct ieee80211_sub_if_data *sdata) +-{ +- DEBUGFS_ADD(drop_unencrypted); +- DEBUGFS_ADD(flags); +- DEBUGFS_ADD(state); +- DEBUGFS_ADD(channel_type); +- DEBUGFS_ADD(rc_rateidx_mask_2ghz); +- DEBUGFS_ADD(rc_rateidx_mask_5ghz); +- DEBUGFS_ADD(rc_rateidx_mcs_mask_2ghz); +- DEBUGFS_ADD(rc_rateidx_mcs_mask_5ghz); +-} +- +-static void add_monitor_files(struct ieee80211_sub_if_data *sdata) +-{ +- DEBUGFS_ADD(flags); +- DEBUGFS_ADD(state); +- DEBUGFS_ADD(channel_type); +-} +- + #ifdef CONFIG_MAC80211_MESH + + static void add_mesh_stats(struct ieee80211_sub_if_data *sdata) +@@ -590,6 +544,13 @@ static void add_files(struct ieee80211_s + if (!sdata->debugfs.dir) + return; + ++ DEBUGFS_ADD(flags); ++ DEBUGFS_ADD(state); ++ DEBUGFS_ADD(channel_type); ++ ++ if (sdata->vif.type != NL80211_IFTYPE_MONITOR) ++ add_common_files(sdata); ++ + switch (sdata->vif.type) { + case NL80211_IFTYPE_MESH_POINT: + #ifdef CONFIG_MAC80211_MESH +@@ -609,12 +570,6 @@ static void add_files(struct ieee80211_s + case NL80211_IFTYPE_WDS: + add_wds_files(sdata); + break; +- case NL80211_IFTYPE_MONITOR: +- add_monitor_files(sdata); +- break; +- case NL80211_IFTYPE_AP_VLAN: +- add_vlan_files(sdata); +- break; + default: + break; + } |