diff options
author | John W. Linville <linville@tuxdriver.com> | 2012-08-02 19:49:38 +0200 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-08-02 19:49:38 +0200 |
commit | 1a26904eb63150bba2120fc2864e9307d1500691 (patch) | |
tree | b071dc0b08138a1f3d54972cc864b556c6995694 /include/net | |
parent | ipv4: route.c cleanup (diff) | |
parent | cfg80211: Clear "beacon_found" on regulatory restore (diff) | |
download | linux-1a26904eb63150bba2120fc2864e9307d1500691.tar.xz linux-1a26904eb63150bba2120fc2864e9307d1500691.zip |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
Diffstat (limited to 'include/net')
-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 493fa0c79005..3d254e10ff30 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 \ |