---

yaml --- r: 351935 b: refs/heads/master c: 55b183a h: refs/heads/master i: 351933: 1ef5b03 351931: ebe7536 351927: 06fabdd 351919: 20a2388 351903: ab90454 351871: 585e11d v: v3
git-mirror · Jan 11, 2013 · 034ff25 · 034ff25
1 parent c4aeb4c
commit 034ff25
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 75e6934a9e996ee7cfe7a488b7f7cc2baa86717a
+refs/heads/master: 55b183ad8635589ea731a31653de79a2626491c4
diff --git a/trunk/net/wireless/reg.c b/trunk/net/wireless/reg.c
@@ -1123,7 +1123,9 @@ static bool is_ht40_allowed(struct ieee80211_channel *chan)
 	if (chan->flags & IEEE80211_CHAN_DISABLED)
 		return false;
 	/* This would happen when regulatory rules disallow HT40 completely */
-	return !(chan->flags & IEEE80211_CHAN_NO_HT40);
+	if ((chan->flags & IEEE80211_CHAN_NO_HT40) == IEEE80211_CHAN_NO_HT40)
+		return false;
+	return true;
 }
 
 static void reg_process_ht_flags_channel(struct wiphy *wiphy,