From 034ff25909f71ddc7696c9e3eb2261222e3b8a7b Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Fri, 11 Jan 2013 14:22:58 +0100 Subject: [PATCH] --- yaml --- r: 351935 b: refs/heads/master c: 55b183ad8635589ea731a31653de79a2626491c4 h: refs/heads/master i: 351933: 1ef5b031a15a020d014d1242aef181a89a7102c6 351931: ebe7536139489f533ae4822180468eaaf9f732d2 351927: 06fabddcc4c506192d5f18258c10448d99440053 351919: 20a23880b864dabae120d1cc70a90f140ba729be 351903: ab90454cddb198826f509c2fd9d0c32076894447 351871: 585e11d4710644de338241357bbca37be084fcbc v: v3 --- [refs] | 2 +- trunk/net/wireless/reg.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 99fc86119f01..89648fd4290f 100644 --- 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 index 8c114e8a9135..6ea626b30a2a 100644 --- 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,