diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2012-01-07 20:54:33 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2012-01-07 20:54:33 +0000 |
| commit | 2d17b67c28e8b1279b53c09881259cd819336fab (patch) | |
| tree | 7619d7b9917d74c1eafa610fcb6a97910c122b90 /package/mac80211/patches/513-ath9k_channelbw_debugfs.patch | |
| parent | 9727256330d73b85f0d0bc6fa46b482ae33194cd (diff) | |
| download | upstream-2d17b67c28e8b1279b53c09881259cd819336fab.tar.gz upstream-2d17b67c28e8b1279b53c09881259cd819336fab.tar.bz2 upstream-2d17b67c28e8b1279b53c09881259cd819336fab.zip | |
ath9k: merge a channel change fix from linux-wireless
SVN-Revision: 29684
Diffstat (limited to 'package/mac80211/patches/513-ath9k_channelbw_debugfs.patch')
| -rw-r--r-- | package/mac80211/patches/513-ath9k_channelbw_debugfs.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/package/mac80211/patches/513-ath9k_channelbw_debugfs.patch b/package/mac80211/patches/513-ath9k_channelbw_debugfs.patch index c5ca0e2b57..ae65b60e1b 100644 --- a/package/mac80211/patches/513-ath9k_channelbw_debugfs.patch +++ b/package/mac80211/patches/513-ath9k_channelbw_debugfs.patch @@ -90,19 +90,19 @@ { struct ath_softc *sc = hw->priv; struct ath_hw *ah = sc->sc_ah; -@@ -1616,9 +1616,10 @@ static int ath9k_config(struct ieee80211 +@@ -1616,9 +1616,11 @@ static int ath9k_config(struct ieee80211 if (changed & IEEE80211_CONF_CHANGE_CHANNEL) { struct ieee80211_channel *curchan = hw->conf.channel; -- struct ath9k_channel old_chan; -+ struct ath9k_channel old_chan, *hchan; ++ struct ath9k_channel *hchan; int pos = curchan->hw_value; int old_pos = -1; -+ u32 oldflags; unsigned long flags; ++ u32 oldflags; if (ah->curchan) -@@ -1671,7 +1672,23 @@ static int ath9k_config(struct ieee80211 + old_pos = ah->curchan - &ah->channels[0]; +@@ -1667,7 +1669,23 @@ static int ath9k_config(struct ieee80211 memset(&sc->survey[pos], 0, sizeof(struct survey_info)); } |