diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2013-01-14 15:59:28 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2013-01-14 15:59:28 +0000 |
| commit | 721059ed00a45bb4d30c6cd3f2cf74c330336982 (patch) | |
| tree | fbc03b42b71b6a2df4d586f533894eb7ecce0430 /package/mac80211/patches/512-ath9k_channelbw_debugfs.patch | |
| parent | fef4cf011078377129ab3e1c2efd7e5f96a7a660 (diff) | |
| download | upstream-721059ed00a45bb4d30c6cd3f2cf74c330336982.tar.gz upstream-721059ed00a45bb4d30c6cd3f2cf74c330336982.tar.bz2 upstream-721059ed00a45bb4d30c6cd3f2cf74c330336982.zip | |
ath9k: fix a soft lockup on smp systems
Backport of r35152
git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@35153 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 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/package/mac80211/patches/512-ath9k_channelbw_debugfs.patch b/package/mac80211/patches/512-ath9k_channelbw_debugfs.patch index db6d36b68e..15111e9b82 100644 --- a/package/mac80211/patches/512-ath9k_channelbw_debugfs.patch +++ b/package/mac80211/patches/512-ath9k_channelbw_debugfs.patch @@ -80,7 +80,7 @@ } --- a/drivers/net/wireless/ath/ath9k/main.c +++ b/drivers/net/wireless/ath/ath9k/main.c -@@ -1121,7 +1121,7 @@ static void ath9k_disable_ps(struct ath_ +@@ -1120,7 +1120,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; -@@ -1175,9 +1175,11 @@ static int ath9k_config(struct ieee80211 +@@ -1174,9 +1174,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]; -@@ -1220,7 +1222,23 @@ static int ath9k_config(struct ieee80211 +@@ -1219,7 +1221,23 @@ static int ath9k_config(struct ieee80211 memset(&sc->survey[pos], 0, sizeof(struct survey_info)); } |