projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mac80211: update to wireless-testing 2012-12-06
[openwrt.git]
/
package
/
mac80211
/
patches
/
512-ath9k_channelbw_debugfs.patch
diff --git
a/package/mac80211/patches/512-ath9k_channelbw_debugfs.patch
b/package/mac80211/patches/512-ath9k_channelbw_debugfs.patch
index
88b6d29
..
ff3a38e
100644
(file)
--- 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
--- a/drivers/net/wireless/ath/ath9k/ath9k.h
+++ b/drivers/net/wireless/ath/ath9k/ath9k.h
-@@ -6
59,6 +65
9,7 @@ struct ath_softc {
+@@ -6
79,6 +67
9,7 @@ struct ath_softc {
struct ieee80211_hw *hw;
struct device *dev;
struct ieee80211_hw *hw;
struct device *dev;
@@
-8,7
+8,7
@@
struct survey_info *cur_survey;
struct survey_info survey[ATH9K_NUM_CHANNELS];
struct survey_info *cur_survey;
struct survey_info survey[ATH9K_NUM_CHANNELS];
-@@ -7
34,6 +735
,7 @@ struct ath_softc {
+@@ -7
51,6 +752
,7 @@ struct ath_softc {
#endif
};
#endif
};
@@
-18,7
+18,7
@@
--- a/drivers/net/wireless/ath/ath9k/debug.c
+++ b/drivers/net/wireless/ath/ath9k/debug.c
--- a/drivers/net/wireless/ath/ath9k/debug.c
+++ b/drivers/net/wireless/ath/ath9k/debug.c
-@@ -1
579,6 +1579
,50 @@ static const struct file_operations fops
+@@ -1
765,6 +1765
,50 @@ static const struct file_operations fops
.owner = THIS_MODULE
};
.owner = THIS_MODULE
};
@@
-69,18
+69,18
@@
int ath9k_init_debug(struct ath_hw *ah)
{
struct ath_common *common = ath9k_hw_common(ah);
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("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);
+ 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
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
-@@ -1
127,7 +1127
,7 @@ static void ath9k_disable_ps(struct ath_
+@@ -1
075,7 +1075
,7 @@ static void ath9k_disable_ps(struct ath_
ath_dbg(common, PS, "PowerSave disabled\n");
}
ath_dbg(common, PS, "PowerSave disabled\n");
}
@@
-89,7
+89,7
@@
{
struct ath_softc *sc = hw->priv;
struct ath_hw *ah = sc->sc_ah;
{
struct ath_softc *sc = hw->priv;
struct ath_hw *ah = sc->sc_ah;
-@@ -11
81,9 +1181
,11 @@ static int ath9k_config(struct ieee80211
+@@ -11
29,9 +1129
,11 @@ static int ath9k_config(struct ieee80211
if ((changed & IEEE80211_CONF_CHANGE_CHANNEL) || reset_channel) {
struct ieee80211_channel *curchan = hw->conf.channel;
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];
if (ah->curchan)
old_pos = ah->curchan - &ah->channels[0];
-@@ -1
226,7 +1228
,23 @@ static int ath9k_config(struct ieee80211
+@@ -1
174,7 +1176
,23 @@ static int ath9k_config(struct ieee80211
memset(&sc->survey[pos], 0, sizeof(struct survey_info));
}
memset(&sc->survey[pos], 0, sizeof(struct survey_info));
}