diff options
author | David S. Miller <davem@davemloft.net> | 2011-03-15 13:57:18 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-03-15 13:57:18 -0700 |
commit | 918690f9811029667eaf132dbfeb180c6e4e2029 (patch) | |
tree | 7bcefc7484e88090eba789b3b6a52e17a83a2f55 /net/mac80211/chan.c | |
parent | 31111c26d976ca0f298312f08e44cdb078005b03 (diff) | |
parent | 106af2c99a5249b809aaed45b8353ac087821f4a (diff) | |
download | op-kernel-dev-918690f9811029667eaf132dbfeb180c6e4e2029.zip op-kernel-dev-918690f9811029667eaf132dbfeb180c6e4e2029.tar.gz |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'net/mac80211/chan.c')
-rw-r--r-- | net/mac80211/chan.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/mac80211/chan.c b/net/mac80211/chan.c index 5b24740..889c3e9 100644 --- a/net/mac80211/chan.c +++ b/net/mac80211/chan.c @@ -77,6 +77,9 @@ bool ieee80211_set_channel_type(struct ieee80211_local *local, switch (tmp->vif.bss_conf.channel_type) { case NL80211_CHAN_NO_HT: case NL80211_CHAN_HT20: + if (superchan > tmp->vif.bss_conf.channel_type) + break; + superchan = tmp->vif.bss_conf.channel_type; break; case NL80211_CHAN_HT40PLUS: |