From 34ed0977c596a5fe743b2efe4ef698e4d089a365 Mon Sep 17 00:00:00 2001 From: nbd Date: Sun, 20 Jan 2013 18:33:21 +0000 Subject: ath9k: merge another round of cleanups and stability fixes, refresh patches git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35255 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/mac80211/patches/512-ath9k_channelbw_debugfs.patch | 10 +++++----- 1 file changed, 5 insertions(+), 5 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 8c459180a..6dde93d7a 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 -@@ -671,6 +671,7 @@ struct ath_softc { +@@ -670,6 +670,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]; -@@ -743,6 +744,7 @@ struct ath_softc { +@@ -742,6 +743,7 @@ struct ath_softc { #endif }; @@ -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 -@@ -1068,7 +1068,7 @@ static void ath9k_disable_ps(struct ath_ +@@ -1065,7 +1065,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; -@@ -1122,9 +1122,11 @@ static int ath9k_config(struct ieee80211 +@@ -1119,9 +1119,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]; -@@ -1167,7 +1169,23 @@ static int ath9k_config(struct ieee80211 +@@ -1164,7 +1166,23 @@ static int ath9k_config(struct ieee80211 memset(&sc->survey[pos], 0, sizeof(struct survey_info)); } -- cgit v1.2.3