diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2012-06-18 01:26:36 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2012-06-18 01:26:36 +0000 |
| commit | 33600679329458db7a0d258f3985daa52d98bf75 (patch) | |
| tree | 9c5f6766d736f534cb39faa25b00a9b126d26f94 /package/mac80211/patches/512-ath9k_channelbw_debugfs.patch | |
| parent | c73b39fd302245a47813d1a41a082df7b82c45fb (diff) | |
| download | upstream-33600679329458db7a0d258f3985daa52d98bf75.tar.gz upstream-33600679329458db7a0d258f3985daa52d98bf75.tar.bz2 upstream-33600679329458db7a0d258f3985daa52d98bf75.zip | |
mac80211: update to wireless-testing 2012-06-14
SVN-Revision: 32420
Diffstat (limited to 'package/mac80211/patches/512-ath9k_channelbw_debugfs.patch')
| -rw-r--r-- | package/mac80211/patches/512-ath9k_channelbw_debugfs.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/package/mac80211/patches/512-ath9k_channelbw_debugfs.patch b/package/mac80211/patches/512-ath9k_channelbw_debugfs.patch index 6410a6e2b0..7feed482bf 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 -@@ -621,6 +621,7 @@ struct ath_softc { +@@ -641,6 +641,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]; -@@ -688,6 +689,7 @@ struct ath_softc { +@@ -709,6 +710,7 @@ struct ath_softc { struct dfs_pattern_detector *dfs_detector; }; @@ -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 +@@ -1580,6 +1580,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); -@@ -1645,5 +1689,8 @@ int ath9k_init_debug(struct ath_hw *ah) +@@ -1646,5 +1690,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 -@@ -1551,7 +1551,7 @@ static void ath9k_disable_ps(struct ath_ +@@ -1122,7 +1122,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; -@@ -1602,9 +1602,11 @@ static int ath9k_config(struct ieee80211 +@@ -1173,9 +1173,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]; -@@ -1652,7 +1654,23 @@ static int ath9k_config(struct ieee80211 +@@ -1218,7 +1220,23 @@ static int ath9k_config(struct ieee80211 memset(&sc->survey[pos], 0, sizeof(struct survey_info)); } @@ -125,4 +125,4 @@ + if (ath_set_channel(sc, hw, hchan) < 0) { ath_err(common, "Unable to set channel\n"); mutex_unlock(&sc->mutex); - return -EINVAL; + ath9k_ps_restore(sc); |