From 8f7f0f90900053b35ab3d24dc4da5af4eb1d6fef Mon Sep 17 00:00:00 2001 From: nbd Date: Wed, 9 Jan 2013 12:56:25 +0000 Subject: mac80211, ath9k: merge some pending fixes from linux-wireless@ git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35066 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/mac80211/patches/512-ath9k_channelbw_debugfs.patch | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'package/mac80211/patches/512-ath9k_channelbw_debugfs.patch') diff --git a/package/mac80211/patches/512-ath9k_channelbw_debugfs.patch b/package/mac80211/patches/512-ath9k_channelbw_debugfs.patch index 2dfed5915..73ffc8b3b 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 -@@ -674,6 +674,7 @@ struct ath_softc { +@@ -672,6 +672,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]; -@@ -746,6 +747,7 @@ struct ath_softc { +@@ -744,6 +745,7 @@ struct ath_softc { #endif }; @@ -18,7 +18,7 @@ --- a/drivers/net/wireless/ath/ath9k/debug.c +++ b/drivers/net/wireless/ath/ath9k/debug.c -@@ -1765,6 +1765,50 @@ static const struct file_operations fops +@@ -1764,6 +1764,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); -@@ -1784,6 +1828,8 @@ int ath9k_init_debug(struct ath_hw *ah) +@@ -1783,6 +1827,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 -@@ -1075,7 +1075,7 @@ static void ath9k_disable_ps(struct ath_ +@@ -1069,7 +1069,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; -@@ -1129,9 +1129,11 @@ static int ath9k_config(struct ieee80211 +@@ -1123,9 +1123,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]; -@@ -1174,7 +1176,23 @@ static int ath9k_config(struct ieee80211 +@@ -1168,7 +1170,23 @@ static int ath9k_config(struct ieee80211 memset(&sc->survey[pos], 0, sizeof(struct survey_info)); } -- cgit v1.2.3