diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2013-01-09 12:49:21 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2013-01-09 12:49:21 +0000 |
| commit | e505441f7c45d65d69d55e998a86a07d9539dd7e (patch) | |
| tree | 6f896420a39248d51dfe541a1cb518c536179ead /package/mac80211/patches/512-ath9k_channelbw_debugfs.patch | |
| parent | 9735a162dcb601a9ceb617dc5877acf5326db289 (diff) | |
| download | upstream-e505441f7c45d65d69d55e998a86a07d9539dd7e.tar.gz upstream-e505441f7c45d65d69d55e998a86a07d9539dd7e.tar.bz2 upstream-e505441f7c45d65d69d55e998a86a07d9539dd7e.zip | |
ath9k: backport stability fixes from r35063
git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@35064 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211/patches/512-ath9k_channelbw_debugfs.patch')
| -rw-r--r-- | package/mac80211/patches/512-ath9k_channelbw_debugfs.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/package/mac80211/patches/512-ath9k_channelbw_debugfs.patch b/package/mac80211/patches/512-ath9k_channelbw_debugfs.patch index 88b6d29832..e64132e03a 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 { +@@ -657,6 +657,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 { +@@ -732,6 +733,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 +@@ -1578,6 +1578,50 @@ static const struct file_operations fops .owner = THIS_MODULE }; @@ -69,7 +69,7 @@ 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) +@@ -1652,5 +1696,8 @@ int ath9k_init_debug(struct ath_hw *ah) debugfs_create_file("eeprom", S_IRUSR, sc->debug.debugfs_phy, sc, &fops_eeprom); @@ -80,7 +80,7 @@ } --- 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_ +@@ -1121,7 +1121,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 +@@ -1175,9 +1175,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 +@@ -1220,7 +1222,23 @@ static int ath9k_config(struct ieee80211 memset(&sc->survey[pos], 0, sizeof(struct survey_info)); } |