aboutsummaryrefslogtreecommitdiffstats
path: root/package/mac80211/patches/512-ath9k_channelbw_debugfs.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2012-12-07 16:46:04 +0000
committerFelix Fietkau <nbd@openwrt.org>2012-12-07 16:46:04 +0000
commit6716ba9aadc93b2858ab800a84cb4335c92324ff (patch)
tree8f8fbea06486b2e23eb4be46d92b4b0f121e831c /package/mac80211/patches/512-ath9k_channelbw_debugfs.patch
parent3365e2caf014e24ff8ea091a3d93cb89f330b70b (diff)
downloadupstream-6716ba9aadc93b2858ab800a84cb4335c92324ff.tar.gz
upstream-6716ba9aadc93b2858ab800a84cb4335c92324ff.tar.bz2
upstream-6716ba9aadc93b2858ab800a84cb4335c92324ff.zip
mac80211: update to wireless-testing 2012-12-06
SVN-Revision: 34571
Diffstat (limited to 'package/mac80211/patches/512-ath9k_channelbw_debugfs.patch')
-rw-r--r--package/mac80211/patches/512-ath9k_channelbw_debugfs.patch22
1 files changed, 11 insertions, 11 deletions
diff --git a/package/mac80211/patches/512-ath9k_channelbw_debugfs.patch b/package/mac80211/patches/512-ath9k_channelbw_debugfs.patch
index 88b6d29832..ff3a38eb58 100644
--- a/package/mac80211/patches/512-ath9k_channelbw_debugfs.patch
+++ b/package/mac80211/patches/512-ath9k_channelbw_debugfs.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/wireless/ath/ath9k/ath9k.h
+++ b/drivers/net/wireless/ath/ath9k/ath9k.h
-@@ -659,6 +659,7 @@ struct ath_softc {
+@@ -679,6 +679,7 @@ struct ath_softc {
struct ieee80211_hw *hw;
struct device *dev;
@@ -8,7 +8,7 @@
struct survey_info *cur_survey;
struct survey_info survey[ATH9K_NUM_CHANNELS];
-@@ -734,6 +735,7 @@ struct ath_softc {
+@@ -751,6 +752,7 @@ struct ath_softc {
#endif
};
@@ -18,7 +18,7 @@
--- a/drivers/net/wireless/ath/ath9k/debug.c
+++ b/drivers/net/wireless/ath/ath9k/debug.c
-@@ -1579,6 +1579,50 @@ static const struct file_operations fops
+@@ -1765,6 +1765,50 @@ static const struct file_operations fops
.owner = THIS_MODULE
};
@@ -69,18 +69,18 @@
int ath9k_init_debug(struct ath_hw *ah)
{
struct ath_common *common = ath9k_hw_common(ah);
-@@ -1653,5 +1697,8 @@ int ath9k_init_debug(struct ath_hw *ah)
+@@ -1784,6 +1828,8 @@ int ath9k_init_debug(struct ath_hw *ah)
+
debugfs_create_file("eeprom", S_IRUSR, sc->debug.debugfs_phy, sc,
&fops_eeprom);
-
+ debugfs_create_file("chanbw", S_IRUSR | S_IWUSR, sc->debug.debugfs_phy,
+ sc, &fops_chanbw);
-+
- return 0;
- }
+ debugfs_create_file("dma", S_IRUSR, sc->debug.debugfs_phy, sc,
+ &fops_dma);
+ debugfs_create_file("interrupt", S_IRUSR, sc->debug.debugfs_phy, sc,
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
-@@ -1127,7 +1127,7 @@ static void ath9k_disable_ps(struct ath_
+@@ -1075,7 +1075,7 @@ static void ath9k_disable_ps(struct ath_
ath_dbg(common, PS, "PowerSave disabled\n");
}
@@ -89,7 +89,7 @@
{
struct ath_softc *sc = hw->priv;
struct ath_hw *ah = sc->sc_ah;
-@@ -1181,9 +1181,11 @@ static int ath9k_config(struct ieee80211
+@@ -1129,9 +1129,11 @@ static int ath9k_config(struct ieee80211
if ((changed & IEEE80211_CONF_CHANGE_CHANNEL) || reset_channel) {
struct ieee80211_channel *curchan = hw->conf.channel;
@@ -101,7 +101,7 @@
if (ah->curchan)
old_pos = ah->curchan - &ah->channels[0];
-@@ -1226,7 +1228,23 @@ static int ath9k_config(struct ieee80211
+@@ -1174,7 +1176,23 @@ static int ath9k_config(struct ieee80211
memset(&sc->survey[pos], 0, sizeof(struct survey_info));
}