diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2013-04-28 12:37:09 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2013-04-28 12:37:09 +0000 |
| commit | d520c048d8eda9083b3fffb4e4e0a82a8a8b0c6b (patch) | |
| tree | 55111555c00d21d4857262bd9ca3ee0bc2bcf222 /package/mac80211/patches/512-ath9k_channelbw_debugfs.patch | |
| parent | acd03cf8d8c3a047108b7983944b0c8d0228f812 (diff) | |
| download | upstream-d520c048d8eda9083b3fffb4e4e0a82a8a8b0c6b.tar.gz upstream-d520c048d8eda9083b3fffb4e4e0a82a8a8b0c6b.tar.bz2 upstream-d520c048d8eda9083b3fffb4e4e0a82a8a8b0c6b.zip | |
mac80211: update to 2013-02-22 from trunk + backports
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@36470 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 | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/package/mac80211/patches/512-ath9k_channelbw_debugfs.patch b/package/mac80211/patches/512-ath9k_channelbw_debugfs.patch index 15111e9b82..4156773228 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 -@@ -656,6 +656,7 @@ struct ath_softc { +@@ -689,6 +689,7 @@ struct ath_softc { struct ieee80211_hw *hw; struct device *dev; @@ -8,9 +8,9 @@ struct survey_info *cur_survey; struct survey_info survey[ATH9K_NUM_CHANNELS]; -@@ -731,6 +732,7 @@ struct ath_softc { - #endif - }; +@@ -893,6 +894,7 @@ struct fft_sample_ht20 { + u8 data[SPECTRAL_HT20_NUM_BINS]; + } __packed; +int ath9k_config(struct ieee80211_hw *hw, u32 changed); void ath9k_tasklet(unsigned long data); @@ -18,7 +18,7 @@ --- a/drivers/net/wireless/ath/ath9k/debug.c +++ b/drivers/net/wireless/ath/ath9k/debug.c -@@ -1578,6 +1578,50 @@ static const struct file_operations fops +@@ -2050,6 +2050,50 @@ static const struct file_operations fops .owner = THIS_MODULE }; @@ -69,19 +69,19 @@ int ath9k_init_debug(struct ath_hw *ah) { struct ath_common *common = ath9k_hw_common(ah); -@@ -1652,5 +1696,8 @@ int ath9k_init_debug(struct ath_hw *ah) +@@ -2069,6 +2113,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 -@@ -1120,7 +1120,7 @@ static void ath9k_disable_ps(struct ath_ - ath_dbg(common, PS, "PowerSave disabled\n"); +@@ -1136,7 +1136,7 @@ int ath9k_spectral_scan_config(struct ie + return 0; } -static int ath9k_config(struct ieee80211_hw *hw, u32 changed) @@ -89,7 +89,7 @@ { struct ath_softc *sc = hw->priv; struct ath_hw *ah = sc->sc_ah; -@@ -1174,9 +1174,11 @@ static int ath9k_config(struct ieee80211 +@@ -1190,9 +1190,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]; -@@ -1219,7 +1221,23 @@ static int ath9k_config(struct ieee80211 +@@ -1235,7 +1237,23 @@ static int ath9k_config(struct ieee80211 memset(&sc->survey[pos], 0, sizeof(struct survey_info)); } |