From 41bd2c82a75b3a876ac1cce4c385e60a3f54766a Mon Sep 17 00:00:00 2001
From: Helmut Schaa <helmut.schaa@googlemail.com>
Date: Mon, 17 May 2010 17:30:59 +0200
Subject: [PATCH] --- yaml --- r: 202757 b: refs/heads/master c:
 aed8e1f9910b216ab3e14cb286c431c870f9b78f h: refs/heads/master i:   202755:
 9c17572c0d69cc88440c911de3e41aa63a8a59b0 v: v3

---
 [refs]                    | 2 +-
 trunk/net/wireless/chan.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 8be68df7bf35..993d7e7bc4bb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 17525f96aeeed156bd4a6dee21816100f77b0c71
+refs/heads/master: aed8e1f9910b216ab3e14cb286c431c870f9b78f
diff --git a/trunk/net/wireless/chan.c b/trunk/net/wireless/chan.c
index b01a6f6397d7..d0c92dddb26b 100644
--- a/trunk/net/wireless/chan.c
+++ b/trunk/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;
 	}