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) | |
download | op-kernel-dev-66ba271ab90424ba5a895662b6783c4837a96e0a.zip op-kernel-dev-66ba271ab90424ba5a895662b6783c4837a96e0a.tar.gz |
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 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, }; /** |