diff options
author | John W. Linville <linville@tuxdriver.com> | 2013-06-24 14:44:59 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2013-06-24 14:44:59 -0400 |
commit | 66ba271ab90424ba5a895662b6783c4837a96e0a (patch) | |
tree | 5ae7ebd942fe3f2246a52d18f35f67d3db4e4b5c /include/uapi | |
parent | 2b5e54e22f596bcd9ec0018f228a2606e016a108 (diff) | |
parent | 6c7c4cbfd5f59c04a40af67ad72d14e19215ef36 (diff) |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Diffstat (limited to 'include/uapi')
-rw-r--r-- | include/uapi/linux/nl80211.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/uapi/linux/nl80211.h b/include/uapi/linux/nl80211.h index ca6facf4df0c..861e5eba3953 100644 --- a/include/uapi/linux/nl80211.h +++ b/include/uapi/linux/nl80211.h | |||
@@ -2758,6 +2758,8 @@ enum nl80211_channel_type { | |||
2758 | * and %NL80211_ATTR_CENTER_FREQ2 attributes must be provided as well | 2758 | * and %NL80211_ATTR_CENTER_FREQ2 attributes must be provided as well |
2759 | * @NL80211_CHAN_WIDTH_160: 160 MHz channel, the %NL80211_ATTR_CENTER_FREQ1 | 2759 | * @NL80211_CHAN_WIDTH_160: 160 MHz channel, the %NL80211_ATTR_CENTER_FREQ1 |
2760 | * attribute must be provided as well | 2760 | * attribute must be provided as well |
2761 | * @NL80211_CHAN_WIDTH_5: 5 MHz OFDM channel | ||
2762 | * @NL80211_CHAN_WIDTH_10: 10 MHz OFDM channel | ||
2761 | */ | 2763 | */ |
2762 | enum nl80211_chan_width { | 2764 | enum nl80211_chan_width { |
2763 | NL80211_CHAN_WIDTH_20_NOHT, | 2765 | NL80211_CHAN_WIDTH_20_NOHT, |
@@ -2766,6 +2768,8 @@ enum nl80211_chan_width { | |||
2766 | NL80211_CHAN_WIDTH_80, | 2768 | NL80211_CHAN_WIDTH_80, |
2767 | NL80211_CHAN_WIDTH_80P80, | 2769 | NL80211_CHAN_WIDTH_80P80, |
2768 | NL80211_CHAN_WIDTH_160, | 2770 | NL80211_CHAN_WIDTH_160, |
2771 | NL80211_CHAN_WIDTH_5, | ||
2772 | NL80211_CHAN_WIDTH_10, | ||
2769 | }; | 2773 | }; |
2770 | 2774 | ||
2771 | /** | 2775 | /** |