diff options
author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2013-06-15 20:14:06 +0000 |
---|---|---|
committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2013-06-15 20:14:06 +0000 |
commit | bf045dedc6b5165cb1c82436b88c5234bfd71a63 (patch) | |
tree | 1412b60e597f5cd3c927166f71c0bd3860e2a766 /package/mac80211/patches/512-ath9k_channelbw_debugfs.patch | |
parent | f94a51603184775d698a903346ee49052c55ffba (diff) |
mac80211: update to wireless-testing 2013-06-13 + latest backport infrastructure
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36939 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 | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/package/mac80211/patches/512-ath9k_channelbw_debugfs.patch b/package/mac80211/patches/512-ath9k_channelbw_debugfs.patch index 541d568a6c..ef87a35922 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 -@@ -695,6 +695,7 @@ struct ath_softc { +@@ -696,6 +696,7 @@ struct ath_softc { struct ieee80211_hw *hw; struct device *dev; @@ -18,7 +18,7 @@ --- a/drivers/net/wireless/ath/ath9k/debug.c +++ b/drivers/net/wireless/ath/ath9k/debug.c -@@ -2059,6 +2059,50 @@ static const struct file_operations fops +@@ -1782,6 +1782,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); -@@ -2078,6 +2122,8 @@ int ath9k_init_debug(struct ath_hw *ah) +@@ -1801,6 +1845,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 @@ 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 -@@ -1140,7 +1140,7 @@ int ath9k_spectral_scan_config(struct ie +@@ -1139,7 +1139,7 @@ int ath9k_spectral_scan_config(struct ie return 0; } @@ -89,7 +89,7 @@ { struct ath_softc *sc = hw->priv; struct ath_hw *ah = sc->sc_ah; -@@ -1196,9 +1196,11 @@ static int ath9k_config(struct ieee80211 +@@ -1195,9 +1195,11 @@ static int ath9k_config(struct ieee80211 struct ieee80211_channel *curchan = hw->conf.chandef.chan; enum nl80211_channel_type channel_type = cfg80211_get_chandef_type(&conf->chandef); @@ -101,7 +101,7 @@ if (ah->curchan) old_pos = ah->curchan - &ah->channels[0]; -@@ -1241,7 +1243,23 @@ static int ath9k_config(struct ieee80211 +@@ -1233,7 +1235,23 @@ static int ath9k_config(struct ieee80211 memset(&sc->survey[pos], 0, sizeof(struct survey_info)); } |