diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-02-27 22:56:05 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-02-27 22:56:05 +0000 |
| commit | e8923f5d9e78fa4a95826f0f0097dc62a9313feb (patch) | |
| tree | d747482bfc6cd15b4add55c737a10349c404afb5 /package/mac80211/patches/513-ath9k_channelbw_debugfs.patch | |
| parent | 56e41e0603549df72bf38c310a45eb37b5ff6fd1 (diff) | |
mac80211: update to wireless-testing 2012-02-27
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@30746 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211/patches/513-ath9k_channelbw_debugfs.patch')
| -rw-r--r-- | package/mac80211/patches/513-ath9k_channelbw_debugfs.patch | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/package/mac80211/patches/513-ath9k_channelbw_debugfs.patch b/package/mac80211/patches/513-ath9k_channelbw_debugfs.patch index 1dcb9b2448..527ef3b529 100644 --- a/package/mac80211/patches/513-ath9k_channelbw_debugfs.patch +++ b/package/mac80211/patches/513-ath9k_channelbw_debugfs.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/ath/ath9k/ath9k.h +++ b/drivers/net/wireless/ath/ath9k/ath9k.h -@@ -595,6 +595,7 @@ struct ath_softc { +@@ -625,6 +625,7 @@ struct ath_softc { struct ieee80211_hw *hw; struct device *dev; @@ -8,7 +8,7 @@ int chan_idx; int chan_is_ht; struct survey_info *cur_survey; -@@ -659,6 +660,7 @@ struct ath_softc { +@@ -692,6 +693,7 @@ struct ath_softc { u8 ant_tx, ant_rx; }; @@ -18,7 +18,7 @@ --- a/drivers/net/wireless/ath/ath9k/debug.c +++ b/drivers/net/wireless/ath/ath9k/debug.c -@@ -1663,6 +1663,50 @@ static const struct file_operations fops +@@ -1599,6 +1599,50 @@ static const struct file_operations fops .owner = THIS_MODULE }; @@ -69,19 +69,18 @@ int ath9k_init_debug(struct ath_hw *ah) { struct ath_common *common = ath9k_hw_common(ah); -@@ -1727,6 +1771,9 @@ int ath9k_init_debug(struct ath_hw *ah) +@@ -1663,5 +1707,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); + - sc->debug.regidx = 0; - memset(&sc->debug.bb_mac_samp, 0, sizeof(sc->debug.bb_mac_samp)); - sc->debug.sampidx = 0; + return 0; + } --- a/drivers/net/wireless/ath/ath9k/main.c +++ b/drivers/net/wireless/ath/ath9k/main.c -@@ -1555,7 +1555,7 @@ static void ath9k_disable_ps(struct ath_ +@@ -1535,7 +1535,7 @@ static void ath9k_disable_ps(struct ath_ } @@ -90,7 +89,7 @@ { struct ath_softc *sc = hw->priv; struct ath_hw *ah = sc->sc_ah; -@@ -1599,9 +1599,11 @@ static int ath9k_config(struct ieee80211 +@@ -1579,9 +1579,11 @@ static int ath9k_config(struct ieee80211 if (changed & IEEE80211_CONF_CHANGE_CHANNEL) { struct ieee80211_channel *curchan = hw->conf.channel; @@ -102,7 +101,7 @@ if (ah->curchan) old_pos = ah->curchan - &ah->channels[0]; -@@ -1649,7 +1651,23 @@ static int ath9k_config(struct ieee80211 +@@ -1629,7 +1631,23 @@ static int ath9k_config(struct ieee80211 memset(&sc->survey[pos], 0, sizeof(struct survey_info)); } @@ -129,7 +128,7 @@ return -EINVAL; --- a/drivers/net/wireless/ath/ath9k/hw.c +++ b/drivers/net/wireless/ath/ath9k/hw.c -@@ -1608,6 +1608,10 @@ int ath9k_hw_reset(struct ath_hw *ah, st +@@ -1570,6 +1570,10 @@ int ath9k_hw_reset(struct ath_hw *ah, st caldata->rtt_hist.num_readings) allow_fbs = true; |