diff options
| author | Johannes Berg | 2012-09-06 15:55:50 +0200 |
|---|---|---|
| committer | Johannes Berg | 2012-09-06 15:56:02 +0200 |
| commit | 944b9e375d89271c39995d363f62cb91734fae5f (patch) | |
| tree | bd6014bd0be251cdf2b32b12ca8a62e55742c0ee /include | |
| parent | a4ed53466a289a4139405bf7190c78a8e9d8debf (diff) | |
| parent | 7ce8c7a3433c6d6f4adfec0611d250782f0b4b0c (diff) | |
Merge remote-tracking branch 'mac80211/master' into mac80211-next
Pull in mac80211.git to let the next patch apply
without conflicts, also resolving a hwsim conflict.
Conflicts:
drivers/net/wireless/mac80211_hwsim.c
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/cfg80211.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h index 60597cf7b83a..903683b1e5b8 100644 --- a/include/net/cfg80211.h +++ b/include/net/cfg80211.h @@ -96,6 +96,7 @@ enum ieee80211_band { * is not permitted. * @IEEE80211_CHAN_NO_HT40MINUS: extension channel below this channel * is not permitted. + * @IEEE80211_CHAN_NO_OFDM: OFDM is not allowed on this channel. */ enum ieee80211_channel_flags { IEEE80211_CHAN_DISABLED = 1<<0, @@ -104,6 +105,7 @@ enum ieee80211_channel_flags { IEEE80211_CHAN_RADAR = 1<<3, IEEE80211_CHAN_NO_HT40PLUS = 1<<4, IEEE80211_CHAN_NO_HT40MINUS = 1<<5, + IEEE80211_CHAN_NO_OFDM = 1<<6, }; #define IEEE80211_CHAN_NO_HT40 \ |