From 05a33283384ecd5dc23a9d65472801539c5a6189 Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Thu, 8 Nov 2012 19:20:56 +0100 Subject: [PATCH] --- yaml --- r: 341607 b: refs/heads/master c: fe4b31810c06cc6518fb193efb9b3c3289b55832 h: refs/heads/master i: 341605: 8aa7d8fc0c381bb7f6d616b125141d40a3e1bfc1 341603: 8ab1cd0094dcae900206509d6cd9550abcf236f4 341599: 3477d03dfcbf558a883e65b9d7a0f78929ef73f2 v: v3 --- [refs] | 2 +- trunk/include/uapi/linux/nl80211.h | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 16fae2617ad5..98059dac4fe8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 42d97a599eb6b2aab3a401b3e5799a399d6c7652 +refs/heads/master: fe4b31810c06cc6518fb193efb9b3c3289b55832 diff --git a/trunk/include/uapi/linux/nl80211.h b/trunk/include/uapi/linux/nl80211.h index 43cd6fa084c5..82b5ad38435b 100644 --- a/trunk/include/uapi/linux/nl80211.h +++ b/trunk/include/uapi/linux/nl80211.h @@ -2438,6 +2438,15 @@ enum nl80211_ac { #define NL80211_TXQ_Q_BE NL80211_AC_BE #define NL80211_TXQ_Q_BK NL80211_AC_BK +/** + * enum nl80211_channel_type - channel type + * @NL80211_CHAN_NO_HT: 20 MHz, non-HT channel + * @NL80211_CHAN_HT20: 20 MHz HT channel + * @NL80211_CHAN_HT40MINUS: HT40 channel, secondary channel + * below the control channel + * @NL80211_CHAN_HT40PLUS: HT40 channel, secondary channel + * above the control channel + */ enum nl80211_channel_type { NL80211_CHAN_NO_HT, NL80211_CHAN_HT20,