summaryrefslogtreecommitdiffstats
path: root/include/net
diff options
context:
space:
mode:
authorRostislav Lisovy <lisovy@gmail.com>2014-04-02 15:31:55 +0200
committerJohannes Berg <johannes.berg@intel.com>2014-04-09 10:56:04 +0200
commit041f607de17666bed0407370e3f4a56e697354a8 (patch)
treed5fff3e88fc450b0532c8d61dff74a19f2fbcefa /include/net
parentce26151bc35d9d893ec1b441a261ea145511c89f (diff)
downloadlinux-041f607de17666bed0407370e3f4a56e697354a8.tar.gz
linux-041f607de17666bed0407370e3f4a56e697354a8.tar.bz2
linux-041f607de17666bed0407370e3f4a56e697354a8.zip
mac80211: Update conf_is_ht() to work properly with 5/10MHz channels
The channels with 5/10MHz bandwidth are not HT. We have to reflect this in conf_is_ht() function which returns whether the particular channel is HT or not. Signed-off-by: Rostislav Lisovy <rostislav.lisovy@fel.cvut.cz> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'include/net')
-rw-r--r--include/net/mac80211.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index 03ab3c08fb70..a3044e124229 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -4585,7 +4585,9 @@ conf_is_ht40(struct ieee80211_conf *conf)
static inline bool
conf_is_ht(struct ieee80211_conf *conf)
{
- return conf->chandef.width != NL80211_CHAN_WIDTH_20_NOHT;
+ return (conf->chandef.width != NL80211_CHAN_WIDTH_5) &&
+ (conf->chandef.width != NL80211_CHAN_WIDTH_10) &&
+ (conf->chandef.width != NL80211_CHAN_WIDTH_20_NOHT);
}
static inline enum nl80211_iftype