summaryrefslogtreecommitdiffstats
path: root/include/uapi
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2013-06-28 13:18:21 -0400
committerJohn W. Linville <linville@tuxdriver.com>2013-06-28 13:18:21 -0400
commit57ed5cd695d7373b8ae0ae9f10fe945e774d58f0 (patch)
tree7ee6244ea7c0be81a541d4e57783f83c4dfd7d66 /include/uapi
parent5e6700b3bf98fe98d630bf9c939ad4c85ce95592 (diff)
parent0f817ed52d07873cd39c9d3f6d87fae962dc742f (diff)
downloadop-kernel-dev-57ed5cd695d7373b8ae0ae9f10fe945e774d58f0.zip
op-kernel-dev-57ed5cd695d7373b8ae0ae9f10fe945e774d58f0.tar.gz
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Conflicts: net/wireless/nl80211.c
Diffstat (limited to 'include/uapi')
-rw-r--r--include/uapi/linux/nl80211.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/uapi/linux/nl80211.h b/include/uapi/linux/nl80211.h
index ca6facf..861e5eb 100644
--- a/include/uapi/linux/nl80211.h
+++ b/include/uapi/linux/nl80211.h
@@ -2758,6 +2758,8 @@ enum nl80211_channel_type {
* and %NL80211_ATTR_CENTER_FREQ2 attributes must be provided as well
* @NL80211_CHAN_WIDTH_160: 160 MHz channel, the %NL80211_ATTR_CENTER_FREQ1
* attribute must be provided as well
+ * @NL80211_CHAN_WIDTH_5: 5 MHz OFDM channel
+ * @NL80211_CHAN_WIDTH_10: 10 MHz OFDM channel
*/
enum nl80211_chan_width {
NL80211_CHAN_WIDTH_20_NOHT,
@@ -2766,6 +2768,8 @@ enum nl80211_chan_width {
NL80211_CHAN_WIDTH_80,
NL80211_CHAN_WIDTH_80P80,
NL80211_CHAN_WIDTH_160,
+ NL80211_CHAN_WIDTH_5,
+ NL80211_CHAN_WIDTH_10,
};
/**
OpenPOWER on IntegriCloud