diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2013-09-08 09:38:38 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2013-09-08 09:38:38 +0000 |
| commit | ba6d9d5cacddec4cacb2fed6f460a17eecff2ac9 (patch) | |
| tree | 1303b2157707aad60be29fc94a7a2586567dfd7b /package/kernel/mac80211/patches/512-ath9k_channelbw_debugfs.patch | |
| parent | da032a4fe0515a97dbad6a0f18e20c058062d38c (diff) | |
| download | upstream-ba6d9d5cacddec4cacb2fed6f460a17eecff2ac9.tar.gz upstream-ba6d9d5cacddec4cacb2fed6f460a17eecff2ac9.tar.bz2 upstream-ba6d9d5cacddec4cacb2fed6f460a17eecff2ac9.zip | |
ath9k: clean up some patches
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37919 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/kernel/mac80211/patches/512-ath9k_channelbw_debugfs.patch')
| -rw-r--r-- | package/kernel/mac80211/patches/512-ath9k_channelbw_debugfs.patch | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/package/kernel/mac80211/patches/512-ath9k_channelbw_debugfs.patch b/package/kernel/mac80211/patches/512-ath9k_channelbw_debugfs.patch index a0bea054a6..69923242ae 100644 --- a/package/kernel/mac80211/patches/512-ath9k_channelbw_debugfs.patch +++ b/package/kernel/mac80211/patches/512-ath9k_channelbw_debugfs.patch @@ -8,14 +8,6 @@ struct survey_info *cur_survey; struct survey_info survey[ATH9K_NUM_CHANNELS]; -@@ -905,6 +906,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); - int ath_cabq_update(struct ath_softc *); - --- a/drivers/net/wireless/ath/ath9k/debug.c +++ b/drivers/net/wireless/ath/ath9k/debug.c @@ -1918,6 +1918,50 @@ static const struct file_operations fops @@ -52,7 +44,7 @@ + + sc->chan_bw = chan_bw; + if (!test_bit(SC_OP_INVALID, &sc->sc_flags)) -+ ath9k_config(sc->hw, IEEE80211_CONF_CHANGE_CHANNEL); ++ ath9k_ops.config(sc->hw, IEEE80211_CONF_CHANGE_CHANNEL); + + return count; +} @@ -80,15 +72,6 @@ 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 -@@ -1146,7 +1146,7 @@ int ath9k_spectral_scan_config(struct ie - return 0; - } - --static int ath9k_config(struct ieee80211_hw *hw, u32 changed) -+int ath9k_config(struct ieee80211_hw *hw, u32 changed) - { - struct ath_softc *sc = hw->priv; - struct ath_hw *ah = sc->sc_ah; @@ -1200,8 +1200,10 @@ static int ath9k_config(struct ieee80211 if ((changed & IEEE80211_CONF_CHANGE_CHANNEL) || reset_channel) { |