diff options
author | Rostislav Lisovy <lisovy@gmail.com> | 2014-04-02 09:31:55 -0400 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2014-04-09 04:56:04 -0400 |
commit | 041f607de17666bed0407370e3f4a56e697354a8 (patch) | |
tree | d5fff3e88fc450b0532c8d61dff74a19f2fbcefa /include/net/mac80211.h | |
parent | ce26151bc35d9d893ec1b441a261ea145511c89f (diff) |
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/mac80211.h')
-rw-r--r-- | include/net/mac80211.h | 4 |
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) | |||
4585 | static inline bool | 4585 | static inline bool |
4586 | conf_is_ht(struct ieee80211_conf *conf) | 4586 | conf_is_ht(struct ieee80211_conf *conf) |
4587 | { | 4587 | { |
4588 | return conf->chandef.width != NL80211_CHAN_WIDTH_20_NOHT; | 4588 | return (conf->chandef.width != NL80211_CHAN_WIDTH_5) && |
4589 | (conf->chandef.width != NL80211_CHAN_WIDTH_10) && | ||
4590 | (conf->chandef.width != NL80211_CHAN_WIDTH_20_NOHT); | ||
4589 | } | 4591 | } |
4590 | 4592 | ||
4591 | static inline enum nl80211_iftype | 4593 | static inline enum nl80211_iftype |