---

yaml --- r: 202757 b: refs/heads/master c: aed8e1f h: refs/heads/master i: 202755: 9c17572 v: v3
git-mirror · Jun 2, 2010 · 41bd2c8 · 41bd2c8
1 parent ba87e4a
commit 41bd2c8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git 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
@@ -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;
 	}