diff options
| author | Helmut Schaa <helmut.schaa@googlemail.com> | 2010-05-17 17:30:59 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-06-02 16:13:17 -0400 |
| commit | aed8e1f9910b216ab3e14cb286c431c870f9b78f (patch) | |
| tree | 31a2742214fbeb45edf82c99c1deb9a27e0fad2d /net/wireless/chan.c | |
| parent | 17525f96aeeed156bd4a6dee21816100f77b0c71 (diff) | |
| download | linux-3.10-aed8e1f9910b216ab3e14cb286c431c870f9b78f.tar.gz linux-3.10-aed8e1f9910b216ab3e14cb286c431c870f9b78f.tar.bz2 linux-3.10-aed8e1f9910b216ab3e14cb286c431c870f9b78f.zip | |
cfg80211: don't refuse HT20 channels on devices that don't support HT40
Don't refuse HT20 channels on devices that don't support HT40.
Signed-off-by: Helmut Schaa <helmut.schaa@googlemail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/wireless/chan.c')
| -rw-r--r-- | net/wireless/chan.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/wireless/chan.c b/net/wireless/chan.c index b01a6f6397d..d0c92dddb26 100644 --- a/net/wireless/chan.c +++ b/net/wireless/chan.c @@ -35,8 +35,9 @@ rdev_freq_to_chan(struct cfg80211_registered_device *rdev, if (!ht_cap->ht_supported) return NULL; - if (!(ht_cap->cap & IEEE80211_HT_CAP_SUP_WIDTH_20_40) || - ht_cap->cap & IEEE80211_HT_CAP_40MHZ_INTOLERANT) + if (channel_type != NL80211_CHAN_HT20 && + (!(ht_cap->cap & IEEE80211_HT_CAP_SUP_WIDTH_20_40) || + ht_cap->cap & IEEE80211_HT_CAP_40MHZ_INTOLERANT)) return NULL; } |