03a3d38c66e5833c1f24fa14640dfe857a107723
[openwrt/openwrt.git] / package / network / utils / iw / patches / 001-nl80211_h_sync.patch
1 --- a/nl80211.h
2 +++ b/nl80211.h
3 @@ -25,10 +25,30 @@
4 *
5 */
6
7 +/*
8 + * This header file defines the userspace API to the wireless stack. Please
9 + * be careful not to break things - i.e. don't move anything around or so
10 + * unless you can demonstrate that it breaks neither API nor ABI.
11 + *
12 + * Additions to the API should be accompanied by actual implementations in
13 + * an upstream driver, so that example implementations exist in case there
14 + * are ever concerns about the precise semantics of the API or changes are
15 + * needed, and to ensure that code for dead (no longer implemented) API
16 + * can actually be identified and removed.
17 + * Nonetheless, semantics should also be documented carefully in this file.
18 + */
19 +
20 #include <linux/types.h>
21
22 #define NL80211_GENL_NAME "nl80211"
23
24 +#define NL80211_MULTICAST_GROUP_CONFIG "config"
25 +#define NL80211_MULTICAST_GROUP_SCAN "scan"
26 +#define NL80211_MULTICAST_GROUP_REG "regulatory"
27 +#define NL80211_MULTICAST_GROUP_MLME "mlme"
28 +#define NL80211_MULTICAST_GROUP_VENDOR "vendor"
29 +#define NL80211_MULTICAST_GROUP_TESTMODE "testmode"
30 +
31 /**
32 * DOC: Station handling
33 *
34 @@ -173,8 +193,8 @@
35 * %NL80211_ATTR_WIPHY and %NL80211_ATTR_WIPHY_NAME.
36 *
37 * @NL80211_CMD_GET_INTERFACE: Request an interface's configuration;
38 - * either a dump request on a %NL80211_ATTR_WIPHY or a specific get
39 - * on an %NL80211_ATTR_IFINDEX is supported.
40 + * either a dump request for all interfaces or a specific get with a
41 + * single %NL80211_ATTR_IFINDEX is supported.
42 * @NL80211_CMD_SET_INTERFACE: Set type of a virtual interface, requires
43 * %NL80211_ATTR_IFINDEX and %NL80211_ATTR_IFTYPE.
44 * @NL80211_CMD_NEW_INTERFACE: Newly created virtual interface or response
45 @@ -227,7 +247,11 @@
46 * the interface identified by %NL80211_ATTR_IFINDEX.
47 * @NL80211_CMD_DEL_STATION: Remove a station identified by %NL80211_ATTR_MAC
48 * or, if no MAC address given, all stations, on the interface identified
49 - * by %NL80211_ATTR_IFINDEX.
50 + * by %NL80211_ATTR_IFINDEX. %NL80211_ATTR_MGMT_SUBTYPE and
51 + * %NL80211_ATTR_REASON_CODE can optionally be used to specify which type
52 + * of disconnection indication should be sent to the station
53 + * (Deauthentication or Disassociation frame and reason code for that
54 + * frame).
55 *
56 * @NL80211_CMD_GET_MPATH: Get mesh path attributes for mesh path to
57 * destination %NL80211_ATTR_MAC on the interface identified by
58 @@ -248,7 +272,18 @@
59 * %NL80211_ATTR_IFINDEX.
60 *
61 * @NL80211_CMD_GET_REG: ask the wireless core to send us its currently set
62 - * regulatory domain.
63 + * regulatory domain. If %NL80211_ATTR_WIPHY is specified and the device
64 + * has a private regulatory domain, it will be returned. Otherwise, the
65 + * global regdomain will be returned.
66 + * A device will have a private regulatory domain if it uses the
67 + * regulatory_hint() API. Even when a private regdomain is used the channel
68 + * information will still be mended according to further hints from
69 + * the regulatory core to help with compliance. A dump version of this API
70 + * is now available which will returns the global regdomain as well as
71 + * all private regdomains of present wiphys (for those that have it).
72 + * If a wiphy is self-managed (%NL80211_ATTR_WIPHY_SELF_MANAGED_REG), then
73 + * its private regdomain is the only valid one for it. The regulatory
74 + * core is not used to help with compliance in this case.
75 * @NL80211_CMD_SET_REG: Set current regulatory domain. CRDA sends this command
76 * after being queried by the kernel. CRDA replies by sending a regulatory
77 * domain structure which consists of %NL80211_ATTR_REG_ALPHA set to our
78 @@ -302,7 +337,9 @@
79 * if passed, define which channels should be scanned; if not
80 * passed, all channels allowed for the current regulatory domain
81 * are used. Extra IEs can also be passed from the userspace by
82 - * using the %NL80211_ATTR_IE attribute.
83 + * using the %NL80211_ATTR_IE attribute. The first cycle of the
84 + * scheduled scan can be delayed by %NL80211_ATTR_SCHED_SCAN_DELAY
85 + * is supplied.
86 * @NL80211_CMD_STOP_SCHED_SCAN: stop a scheduled scan. Returns -ENOENT if
87 * scheduled scan is not running. The caller may assume that as soon
88 * as the call returns, it is safe to start a new scheduled scan again.
89 @@ -639,7 +676,18 @@
90 * @NL80211_CMD_CH_SWITCH_NOTIFY: An AP or GO may decide to switch channels
91 * independently of the userspace SME, send this event indicating
92 * %NL80211_ATTR_IFINDEX is now on %NL80211_ATTR_WIPHY_FREQ and the
93 - * attributes determining channel width.
94 + * attributes determining channel width. This indication may also be
95 + * sent when a remotely-initiated switch (e.g., when a STA receives a CSA
96 + * from the remote AP) is completed;
97 + *
98 + * @NL80211_CMD_CH_SWITCH_STARTED_NOTIFY: Notify that a channel switch
99 + * has been started on an interface, regardless of the initiator
100 + * (ie. whether it was requested from a remote device or
101 + * initiated on our own). It indicates that
102 + * %NL80211_ATTR_IFINDEX will be on %NL80211_ATTR_WIPHY_FREQ
103 + * after %NL80211_ATTR_CH_SWITCH_COUNT TBTT's. The userspace may
104 + * decide to react to this indication by requesting other
105 + * interfaces to change channel as well.
106 *
107 * @NL80211_CMD_START_P2P_DEVICE: Start the given P2P Device, identified by
108 * its %NL80211_ATTR_WDEV identifier. It must have been created with
109 @@ -738,6 +786,31 @@
110 * before removing a station entry entirely, or before disassociating
111 * or similar, cleanup will happen in the driver/device in this case.
112 *
113 + * @NL80211_CMD_GET_MPP: Get mesh path attributes for mesh proxy path to
114 + * destination %NL80211_ATTR_MAC on the interface identified by
115 + * %NL80211_ATTR_IFINDEX.
116 + *
117 + * @NL80211_CMD_JOIN_OCB: Join the OCB network. The center frequency and
118 + * bandwidth of a channel must be given.
119 + * @NL80211_CMD_LEAVE_OCB: Leave the OCB network -- no special arguments, the
120 + * network is determined by the network interface.
121 + *
122 + * @NL80211_CMD_TDLS_CHANNEL_SWITCH: Start channel-switching with a TDLS peer,
123 + * identified by the %NL80211_ATTR_MAC parameter. A target channel is
124 + * provided via %NL80211_ATTR_WIPHY_FREQ and other attributes determining
125 + * channel width/type. The target operating class is given via
126 + * %NL80211_ATTR_OPER_CLASS.
127 + * The driver is responsible for continually initiating channel-switching
128 + * operations and returning to the base channel for communication with the
129 + * AP.
130 + * @NL80211_CMD_TDLS_CANCEL_CHANNEL_SWITCH: Stop channel-switching with a TDLS
131 + * peer given by %NL80211_ATTR_MAC. Both peers must be on the base channel
132 + * when this command completes.
133 + *
134 + * @NL80211_CMD_WIPHY_REG_CHANGE: Similar to %NL80211_CMD_REG_CHANGE, but used
135 + * as an event to indicate changes for devices with wiphy-specific regdom
136 + * management.
137 + *
138 * @NL80211_CMD_MAX: highest used command number
139 * @__NL80211_CMD_AFTER_LAST: internal use
140 */
141 @@ -912,6 +985,18 @@ enum nl80211_commands {
142 NL80211_CMD_ADD_TX_TS,
143 NL80211_CMD_DEL_TX_TS,
144
145 + NL80211_CMD_GET_MPP,
146 +
147 + NL80211_CMD_JOIN_OCB,
148 + NL80211_CMD_LEAVE_OCB,
149 +
150 + NL80211_CMD_CH_SWITCH_STARTED_NOTIFY,
151 +
152 + NL80211_CMD_TDLS_CHANNEL_SWITCH,
153 + NL80211_CMD_TDLS_CANCEL_CHANNEL_SWITCH,
154 +
155 + NL80211_CMD_WIPHY_REG_CHANGE,
156 +
157 /* add new commands above here */
158
159 /* used to define NL80211_CMD_MAX below */
160 @@ -1606,9 +1691,16 @@ enum nl80211_commands {
161 * @NL80211_ATTR_TDLS_PEER_CAPABILITY: flags for TDLS peer capabilities, u32.
162 * As specified in the &enum nl80211_tdls_peer_capability.
163 *
164 - * @NL80211_ATTR_IFACE_SOCKET_OWNER: flag attribute, if set during interface
165 + * @NL80211_ATTR_SOCKET_OWNER: Flag attribute, if set during interface
166 * creation then the new interface will be owned by the netlink socket
167 - * that created it and will be destroyed when the socket is closed
168 + * that created it and will be destroyed when the socket is closed.
169 + * If set during scheduled scan start then the new scan req will be
170 + * owned by the netlink socket that created it and the scheduled scan will
171 + * be stopped when the socket is closed.
172 + * If set during configuration of regulatory indoor operation then the
173 + * regulatory indoor configuration would be owned by the netlink socket
174 + * that configured the indoor setting, and the indoor operation would be
175 + * cleared when the socket is closed.
176 *
177 * @NL80211_ATTR_TDLS_INITIATOR: flag attribute indicating the current end is
178 * the TDLS link initiator.
179 @@ -1638,6 +1730,40 @@ enum nl80211_commands {
180 * @NL80211_ATTR_SMPS_MODE: SMPS mode to use (ap mode). see
181 * &enum nl80211_smps_mode.
182 *
183 + * @NL80211_ATTR_OPER_CLASS: operating class
184 + *
185 + * @NL80211_ATTR_MAC_MASK: MAC address mask
186 + *
187 + * @NL80211_ATTR_WIPHY_SELF_MANAGED_REG: flag attribute indicating this device
188 + * is self-managing its regulatory information and any regulatory domain
189 + * obtained from it is coming from the device's wiphy and not the global
190 + * cfg80211 regdomain.
191 + *
192 + * @NL80211_ATTR_EXT_FEATURES: extended feature flags contained in a byte
193 + * array. The feature flags are identified by their bit index (see &enum
194 + * nl80211_ext_feature_index). The bit index is ordered starting at the
195 + * least-significant bit of the first byte in the array, ie. bit index 0
196 + * is located at bit 0 of byte 0. bit index 25 would be located at bit 1
197 + * of byte 3 (u8 array).
198 + *
199 + * @NL80211_ATTR_SURVEY_RADIO_STATS: Request overall radio statistics to be
200 + * returned along with other survey data. If set, @NL80211_CMD_GET_SURVEY
201 + * may return a survey entry without a channel indicating global radio
202 + * statistics (only some values are valid and make sense.)
203 + * For devices that don't return such an entry even then, the information
204 + * should be contained in the result as the sum of the respective counters
205 + * over all channels.
206 + *
207 + * @NL80211_ATTR_SCHED_SCAN_DELAY: delay before a scheduled scan (or a
208 + * WoWLAN net-detect scan) is started, u32 in seconds.
209 +
210 + * @NL80211_ATTR_REG_INDOOR: flag attribute, if set indicates that the device
211 + * is operating in an indoor environment.
212 + *
213 + * @NL80211_ATTR_WIPHY_ANTENNA_GAIN: Configured antenna gain. Used to reduce
214 + * transmit power to stay within regulatory limits. u32, dBi.
215 + *
216 + * @NUM_NL80211_ATTR: total number of nl80211_attrs available
217 * @NL80211_ATTR_MAX: highest attribute number currently defined
218 * @__NL80211_ATTR_AFTER_LAST: internal use
219 */
220 @@ -1973,7 +2099,7 @@ enum nl80211_attrs {
221
222 NL80211_ATTR_TDLS_PEER_CAPABILITY,
223
224 - NL80211_ATTR_IFACE_SOCKET_OWNER,
225 + NL80211_ATTR_SOCKET_OWNER,
226
227 NL80211_ATTR_CSA_C_OFFSETS_TX,
228 NL80211_ATTR_MAX_CSA_COUNTERS,
229 @@ -1990,15 +2116,35 @@ enum nl80211_attrs {
230
231 NL80211_ATTR_SMPS_MODE,
232
233 + NL80211_ATTR_OPER_CLASS,
234 +
235 + NL80211_ATTR_MAC_MASK,
236 +
237 + NL80211_ATTR_WIPHY_SELF_MANAGED_REG,
238 +
239 + NL80211_ATTR_EXT_FEATURES,
240 +
241 + NL80211_ATTR_SURVEY_RADIO_STATS,
242 +
243 + NL80211_ATTR_NETNS_FD,
244 +
245 + NL80211_ATTR_SCHED_SCAN_DELAY,
246 +
247 + NL80211_ATTR_REG_INDOOR,
248 +
249 + NL80211_ATTR_WIPHY_ANTENNA_GAIN,
250 +
251 /* add attributes here, update the policy in nl80211.c */
252
253 __NL80211_ATTR_AFTER_LAST,
254 + NUM_NL80211_ATTR = __NL80211_ATTR_AFTER_LAST,
255 NL80211_ATTR_MAX = __NL80211_ATTR_AFTER_LAST - 1
256 };
257
258 /* source-level API compatibility */
259 #define NL80211_ATTR_SCAN_GENERATION NL80211_ATTR_GENERATION
260 #define NL80211_ATTR_MESH_PARAMS NL80211_ATTR_MESH_CONFIG
261 +#define NL80211_ATTR_IFACE_SOCKET_OWNER NL80211_ATTR_SOCKET_OWNER
262
263 /*
264 * Allow user space programs to use #ifdef on new attributes by defining them
265 @@ -2028,7 +2174,7 @@ enum nl80211_attrs {
266
267 #define NL80211_MAX_SUPP_RATES 32
268 #define NL80211_MAX_SUPP_HT_RATES 77
269 -#define NL80211_MAX_SUPP_REG_RULES 32
270 +#define NL80211_MAX_SUPP_REG_RULES 64
271 #define NL80211_TKIP_DATA_OFFSET_ENCR_KEY 0
272 #define NL80211_TKIP_DATA_OFFSET_TX_MIC_KEY 16
273 #define NL80211_TKIP_DATA_OFFSET_RX_MIC_KEY 24
274 @@ -2064,6 +2210,8 @@ enum nl80211_attrs {
275 * and therefore can't be created in the normal ways, use the
276 * %NL80211_CMD_START_P2P_DEVICE and %NL80211_CMD_STOP_P2P_DEVICE
277 * commands to create and destroy one
278 + * @NL80211_IF_TYPE_OCB: Outside Context of a BSS
279 + * This mode corresponds to the MIB variable dot11OCBActivated=true
280 * @NL80211_IFTYPE_MAX: highest interface type number currently defined
281 * @NUM_NL80211_IFTYPES: number of defined interface types
282 *
283 @@ -2083,6 +2231,7 @@ enum nl80211_iftype {
284 NL80211_IFTYPE_P2P_CLIENT,
285 NL80211_IFTYPE_P2P_GO,
286 NL80211_IFTYPE_P2P_DEVICE,
287 + NL80211_IFTYPE_OCB,
288
289 /* keep last */
290 NUM_NL80211_IFTYPES,
291 @@ -2165,8 +2314,15 @@ struct nl80211_sta_flag_update {
292 * @NL80211_RATE_INFO_VHT_MCS: MCS index for VHT (u8)
293 * @NL80211_RATE_INFO_VHT_NSS: number of streams in VHT (u8)
294 * @NL80211_RATE_INFO_80_MHZ_WIDTH: 80 MHz VHT rate
295 - * @NL80211_RATE_INFO_80P80_MHZ_WIDTH: 80+80 MHz VHT rate
296 + * @NL80211_RATE_INFO_80P80_MHZ_WIDTH: unused - 80+80 is treated the
297 + * same as 160 for purposes of the bitrates
298 * @NL80211_RATE_INFO_160_MHZ_WIDTH: 160 MHz VHT rate
299 + * @NL80211_RATE_INFO_10_MHZ_WIDTH: 10 MHz width - note that this is
300 + * a legacy rate and will be reported as the actual bitrate, i.e.
301 + * half the base (20 MHz) rate
302 + * @NL80211_RATE_INFO_5_MHZ_WIDTH: 5 MHz width - note that this is
303 + * a legacy rate and will be reported as the actual bitrate, i.e.
304 + * a quarter of the base (20 MHz) rate
305 * @__NL80211_RATE_INFO_AFTER_LAST: internal use
306 */
307 enum nl80211_rate_info {
308 @@ -2181,6 +2337,8 @@ enum nl80211_rate_info {
309 NL80211_RATE_INFO_80_MHZ_WIDTH,
310 NL80211_RATE_INFO_80P80_MHZ_WIDTH,
311 NL80211_RATE_INFO_160_MHZ_WIDTH,
312 + NL80211_RATE_INFO_10_MHZ_WIDTH,
313 + NL80211_RATE_INFO_5_MHZ_WIDTH,
314
315 /* keep last */
316 __NL80211_RATE_INFO_AFTER_LAST,
317 @@ -2225,18 +2383,24 @@ enum nl80211_sta_bss_param {
318 *
319 * @__NL80211_STA_INFO_INVALID: attribute number 0 is reserved
320 * @NL80211_STA_INFO_INACTIVE_TIME: time since last activity (u32, msecs)
321 - * @NL80211_STA_INFO_RX_BYTES: total received bytes (u32, from this station)
322 - * @NL80211_STA_INFO_TX_BYTES: total transmitted bytes (u32, to this station)
323 - * @NL80211_STA_INFO_RX_BYTES64: total received bytes (u64, from this station)
324 - * @NL80211_STA_INFO_TX_BYTES64: total transmitted bytes (u64, to this station)
325 + * @NL80211_STA_INFO_RX_BYTES: total received bytes (MPDU length)
326 + * (u32, from this station)
327 + * @NL80211_STA_INFO_TX_BYTES: total transmitted bytes (MPDU length)
328 + * (u32, to this station)
329 + * @NL80211_STA_INFO_RX_BYTES64: total received bytes (MPDU length)
330 + * (u64, from this station)
331 + * @NL80211_STA_INFO_TX_BYTES64: total transmitted bytes (MPDU length)
332 + * (u64, to this station)
333 * @NL80211_STA_INFO_SIGNAL: signal strength of last received PPDU (u8, dBm)
334 * @NL80211_STA_INFO_TX_BITRATE: current unicast tx rate, nested attribute
335 * containing info as possible, see &enum nl80211_rate_info
336 - * @NL80211_STA_INFO_RX_PACKETS: total received packet (u32, from this station)
337 - * @NL80211_STA_INFO_TX_PACKETS: total transmitted packets (u32, to this
338 - * station)
339 - * @NL80211_STA_INFO_TX_RETRIES: total retries (u32, to this station)
340 - * @NL80211_STA_INFO_TX_FAILED: total failed packets (u32, to this station)
341 + * @NL80211_STA_INFO_RX_PACKETS: total received packet (MSDUs and MMPDUs)
342 + * (u32, from this station)
343 + * @NL80211_STA_INFO_TX_PACKETS: total transmitted packets (MSDUs and MMPDUs)
344 + * (u32, to this station)
345 + * @NL80211_STA_INFO_TX_RETRIES: total retries (MPDUs) (u32, to this station)
346 + * @NL80211_STA_INFO_TX_FAILED: total failed packets (MPDUs)
347 + * (u32, to this station)
348 * @NL80211_STA_INFO_SIGNAL_AVG: signal strength average (u8, dBm)
349 * @NL80211_STA_INFO_LLID: the station's mesh LLID
350 * @NL80211_STA_INFO_PLID: the station's mesh PLID
351 @@ -2260,6 +2424,16 @@ enum nl80211_sta_bss_param {
352 * Same format as NL80211_STA_INFO_CHAIN_SIGNAL.
353 * @NL80211_STA_EXPECTED_THROUGHPUT: expected throughput considering also the
354 * 802.11 header (u32, kbps)
355 + * @NL80211_STA_INFO_RX_DROP_MISC: RX packets dropped for unspecified reasons
356 + * (u64)
357 + * @NL80211_STA_INFO_BEACON_RX: number of beacons received from this peer (u64)
358 + * @NL80211_STA_INFO_BEACON_SIGNAL_AVG: signal strength average
359 + * for beacons only (u8, dBm)
360 + * @NL80211_STA_INFO_TID_STATS: per-TID statistics (see &enum nl80211_tid_stats)
361 + * This is a nested attribute where each the inner attribute number is the
362 + * TID+1 and the special TID 16 (i.e. value 17) is used for non-QoS frames;
363 + * each one of those is again nested with &enum nl80211_tid_stats
364 + * attributes carrying the actual values.
365 * @__NL80211_STA_INFO_AFTER_LAST: internal
366 * @NL80211_STA_INFO_MAX: highest possible station info attribute
367 */
368 @@ -2292,6 +2466,10 @@ enum nl80211_sta_info {
369 NL80211_STA_INFO_CHAIN_SIGNAL,
370 NL80211_STA_INFO_CHAIN_SIGNAL_AVG,
371 NL80211_STA_INFO_EXPECTED_THROUGHPUT,
372 + NL80211_STA_INFO_RX_DROP_MISC,
373 + NL80211_STA_INFO_BEACON_RX,
374 + NL80211_STA_INFO_BEACON_SIGNAL_AVG,
375 + NL80211_STA_INFO_TID_STATS,
376
377 /* keep last */
378 __NL80211_STA_INFO_AFTER_LAST,
379 @@ -2299,6 +2477,31 @@ enum nl80211_sta_info {
380 };
381
382 /**
383 + * enum nl80211_tid_stats - per TID statistics attributes
384 + * @__NL80211_TID_STATS_INVALID: attribute number 0 is reserved
385 + * @NL80211_TID_STATS_RX_MSDU: number of MSDUs received (u64)
386 + * @NL80211_TID_STATS_TX_MSDU: number of MSDUs transmitted (or
387 + * attempted to transmit; u64)
388 + * @NL80211_TID_STATS_TX_MSDU_RETRIES: number of retries for
389 + * transmitted MSDUs (not counting the first attempt; u64)
390 + * @NL80211_TID_STATS_TX_MSDU_FAILED: number of failed transmitted
391 + * MSDUs (u64)
392 + * @NUM_NL80211_TID_STATS: number of attributes here
393 + * @NL80211_TID_STATS_MAX: highest numbered attribute here
394 + */
395 +enum nl80211_tid_stats {
396 + __NL80211_TID_STATS_INVALID,
397 + NL80211_TID_STATS_RX_MSDU,
398 + NL80211_TID_STATS_TX_MSDU,
399 + NL80211_TID_STATS_TX_MSDU_RETRIES,
400 + NL80211_TID_STATS_TX_MSDU_FAILED,
401 +
402 + /* keep last */
403 + NUM_NL80211_TID_STATS,
404 + NL80211_TID_STATS_MAX = NUM_NL80211_TID_STATS - 1
405 +};
406 +
407 +/**
408 * enum nl80211_mpath_flags - nl80211 mesh path flags
409 *
410 * @NL80211_MPATH_FLAG_ACTIVE: the mesh path is active
411 @@ -2631,6 +2834,11 @@ enum nl80211_sched_scan_match_attr {
412 * @NL80211_RRF_AUTO_BW: maximum available bandwidth should be calculated
413 * base on contiguous rules and wider channels will be allowed to cross
414 * multiple contiguous/overlapping frequency ranges.
415 + * @NL80211_RRF_GO_CONCURRENT: See &NL80211_FREQUENCY_ATTR_GO_CONCURRENT
416 + * @NL80211_RRF_NO_HT40MINUS: channels can't be used in HT40- operation
417 + * @NL80211_RRF_NO_HT40PLUS: channels can't be used in HT40+ operation
418 + * @NL80211_RRF_NO_80MHZ: 80MHz operation not allowed
419 + * @NL80211_RRF_NO_160MHZ: 160MHz operation not allowed
420 */
421 enum nl80211_reg_rule_flags {
422 NL80211_RRF_NO_OFDM = 1<<0,
423 @@ -2643,11 +2851,18 @@ enum nl80211_reg_rule_flags {
424 NL80211_RRF_NO_IR = 1<<7,
425 __NL80211_RRF_NO_IBSS = 1<<8,
426 NL80211_RRF_AUTO_BW = 1<<11,
427 + NL80211_RRF_GO_CONCURRENT = 1<<12,
428 + NL80211_RRF_NO_HT40MINUS = 1<<13,
429 + NL80211_RRF_NO_HT40PLUS = 1<<14,
430 + NL80211_RRF_NO_80MHZ = 1<<15,
431 + NL80211_RRF_NO_160MHZ = 1<<16,
432 };
433
434 #define NL80211_RRF_PASSIVE_SCAN NL80211_RRF_NO_IR
435 #define NL80211_RRF_NO_IBSS NL80211_RRF_NO_IR
436 #define NL80211_RRF_NO_IR NL80211_RRF_NO_IR
437 +#define NL80211_RRF_NO_HT40 (NL80211_RRF_NO_HT40MINUS |\
438 + NL80211_RRF_NO_HT40PLUS)
439
440 /* For backport compatibility with older userspace */
441 #define NL80211_RRF_NO_IR_ALL (NL80211_RRF_NO_IR | __NL80211_RRF_NO_IBSS)
442 @@ -2700,16 +2915,18 @@ enum nl80211_user_reg_hint_type {
443 * @NL80211_SURVEY_INFO_FREQUENCY: center frequency of channel
444 * @NL80211_SURVEY_INFO_NOISE: noise level of channel (u8, dBm)
445 * @NL80211_SURVEY_INFO_IN_USE: channel is currently being used
446 - * @NL80211_SURVEY_INFO_CHANNEL_TIME: amount of time (in ms) that the radio
447 - * spent on this channel
448 - * @NL80211_SURVEY_INFO_CHANNEL_TIME_BUSY: amount of the time the primary
449 + * @NL80211_SURVEY_INFO_TIME: amount of time (in ms) that the radio
450 + * was turned on (on channel or globally)
451 + * @NL80211_SURVEY_INFO_TIME_BUSY: amount of the time the primary
452 * channel was sensed busy (either due to activity or energy detect)
453 - * @NL80211_SURVEY_INFO_CHANNEL_TIME_EXT_BUSY: amount of time the extension
454 + * @NL80211_SURVEY_INFO_TIME_EXT_BUSY: amount of time the extension
455 * channel was sensed busy
456 - * @NL80211_SURVEY_INFO_CHANNEL_TIME_RX: amount of time the radio spent
457 - * receiving data
458 - * @NL80211_SURVEY_INFO_CHANNEL_TIME_TX: amount of time the radio spent
459 - * transmitting data
460 + * @NL80211_SURVEY_INFO_TIME_RX: amount of time the radio spent
461 + * receiving data (on channel or globally)
462 + * @NL80211_SURVEY_INFO_TIME_TX: amount of time the radio spent
463 + * transmitting data (on channel or globally)
464 + * @NL80211_SURVEY_INFO_TIME_SCAN: time the radio spent for scan
465 + * (on this channel or globally)
466 * @NL80211_SURVEY_INFO_MAX: highest survey info attribute number
467 * currently defined
468 * @__NL80211_SURVEY_INFO_AFTER_LAST: internal use
469 @@ -2719,17 +2936,25 @@ enum nl80211_survey_info {
470 NL80211_SURVEY_INFO_FREQUENCY,
471 NL80211_SURVEY_INFO_NOISE,
472 NL80211_SURVEY_INFO_IN_USE,
473 - NL80211_SURVEY_INFO_CHANNEL_TIME,
474 - NL80211_SURVEY_INFO_CHANNEL_TIME_BUSY,
475 - NL80211_SURVEY_INFO_CHANNEL_TIME_EXT_BUSY,
476 - NL80211_SURVEY_INFO_CHANNEL_TIME_RX,
477 - NL80211_SURVEY_INFO_CHANNEL_TIME_TX,
478 + NL80211_SURVEY_INFO_TIME,
479 + NL80211_SURVEY_INFO_TIME_BUSY,
480 + NL80211_SURVEY_INFO_TIME_EXT_BUSY,
481 + NL80211_SURVEY_INFO_TIME_RX,
482 + NL80211_SURVEY_INFO_TIME_TX,
483 + NL80211_SURVEY_INFO_TIME_SCAN,
484
485 /* keep last */
486 __NL80211_SURVEY_INFO_AFTER_LAST,
487 NL80211_SURVEY_INFO_MAX = __NL80211_SURVEY_INFO_AFTER_LAST - 1
488 };
489
490 +/* keep old names for compatibility */
491 +#define NL80211_SURVEY_INFO_CHANNEL_TIME NL80211_SURVEY_INFO_TIME
492 +#define NL80211_SURVEY_INFO_CHANNEL_TIME_BUSY NL80211_SURVEY_INFO_TIME_BUSY
493 +#define NL80211_SURVEY_INFO_CHANNEL_TIME_EXT_BUSY NL80211_SURVEY_INFO_TIME_EXT_BUSY
494 +#define NL80211_SURVEY_INFO_CHANNEL_TIME_RX NL80211_SURVEY_INFO_TIME_RX
495 +#define NL80211_SURVEY_INFO_CHANNEL_TIME_TX NL80211_SURVEY_INFO_TIME_TX
496 +
497 /**
498 * enum nl80211_mntr_flags - monitor configuration flags
499 *
500 @@ -2894,7 +3119,8 @@ enum nl80211_mesh_power_mode {
501 *
502 * @NL80211_MESHCONF_PLINK_TIMEOUT: If no tx activity is seen from a STA we've
503 * established peering with for longer than this time (in seconds), then
504 - * remove it from the STA's list of peers. Default is 30 minutes.
505 + * remove it from the STA's list of peers. You may set this to 0 to disable
506 + * the removal of the STA. Default is 30 minutes.
507 *
508 * @__NL80211_MESHCONF_ATTR_AFTER_LAST: internal use
509 */
510 @@ -3166,6 +3392,9 @@ enum nl80211_bss {
511 /**
512 * enum nl80211_bss_status - BSS "status"
513 * @NL80211_BSS_STATUS_AUTHENTICATED: Authenticated with this BSS.
514 + * Note that this is no longer used since cfg80211 no longer
515 + * keeps track of whether or not authentication was done with
516 + * a given BSS.
517 * @NL80211_BSS_STATUS_ASSOCIATED: Associated with this BSS.
518 * @NL80211_BSS_STATUS_IBSS_JOINED: Joined to this IBSS.
519 *
520 @@ -3379,6 +3608,8 @@ enum nl80211_ps_state {
521 * interval in which %NL80211_ATTR_CQM_TXE_PKTS and
522 * %NL80211_ATTR_CQM_TXE_RATE must be satisfied before generating an
523 * %NL80211_CMD_NOTIFY_CQM. Set to 0 to turn off TX error reporting.
524 + * @NL80211_ATTR_CQM_BEACON_LOSS_EVENT: flag attribute that's set in a beacon
525 + * loss event
526 * @__NL80211_ATTR_CQM_AFTER_LAST: internal
527 * @NL80211_ATTR_CQM_MAX: highest key attribute
528 */
529 @@ -3391,6 +3622,7 @@ enum nl80211_attr_cqm {
530 NL80211_ATTR_CQM_TXE_RATE,
531 NL80211_ATTR_CQM_TXE_PKTS,
532 NL80211_ATTR_CQM_TXE_INTVL,
533 + NL80211_ATTR_CQM_BEACON_LOSS_EVENT,
534
535 /* keep last */
536 __NL80211_ATTR_CQM_AFTER_LAST,
537 @@ -3403,9 +3635,7 @@ enum nl80211_attr_cqm {
538 * configured threshold
539 * @NL80211_CQM_RSSI_THRESHOLD_EVENT_HIGH: The RSSI is higher than the
540 * configured threshold
541 - * @NL80211_CQM_RSSI_BEACON_LOSS_EVENT: The device experienced beacon loss.
542 - * (Note that deauth/disassoc will still follow if the AP is not
543 - * available. This event might get used as roaming event, etc.)
544 + * @NL80211_CQM_RSSI_BEACON_LOSS_EVENT: (reserved, never sent)
545 */
546 enum nl80211_cqm_rssi_threshold_event {
547 NL80211_CQM_RSSI_THRESHOLD_EVENT_LOW,
548 @@ -3492,6 +3722,8 @@ struct nl80211_pattern_support {
549 * @NL80211_WOWLAN_TRIG_ANY: wake up on any activity, do not really put
550 * the chip into a special state -- works best with chips that have
551 * support for low-power operation already (flag)
552 + * Note that this mode is incompatible with all of the others, if
553 + * any others are even supported by the device.
554 * @NL80211_WOWLAN_TRIG_DISCONNECT: wake up on disconnect, the way disconnect
555 * is detected is implementation-specific (flag)
556 * @NL80211_WOWLAN_TRIG_MAGIC_PKT: wake up on magic packet (6x 0xff, followed
557 @@ -3545,6 +3777,28 @@ struct nl80211_pattern_support {
558 * @NL80211_WOWLAN_TRIG_WAKEUP_TCP_NOMORETOKENS: For wakeup reporting only,
559 * the TCP connection ran out of tokens to use for data to send to the
560 * service
561 + * @NL80211_WOWLAN_TRIG_NET_DETECT: wake up when a configured network
562 + * is detected. This is a nested attribute that contains the
563 + * same attributes used with @NL80211_CMD_START_SCHED_SCAN. It
564 + * specifies how the scan is performed (e.g. the interval, the
565 + * channels to scan and the initial delay) as well as the scan
566 + * results that will trigger a wake (i.e. the matchsets). This
567 + * attribute is also sent in a response to
568 + * @NL80211_CMD_GET_WIPHY, indicating the number of match sets
569 + * supported by the driver (u32).
570 + * @NL80211_WOWLAN_TRIG_NET_DETECT_RESULTS: nested attribute
571 + * containing an array with information about what triggered the
572 + * wake up. If no elements are present in the array, it means
573 + * that the information is not available. If more than one
574 + * element is present, it means that more than one match
575 + * occurred.
576 + * Each element in the array is a nested attribute that contains
577 + * one optional %NL80211_ATTR_SSID attribute and one optional
578 + * %NL80211_ATTR_SCAN_FREQUENCIES attribute. At least one of
579 + * these attributes must be present. If
580 + * %NL80211_ATTR_SCAN_FREQUENCIES contains more than one
581 + * frequency, it means that the match occurred in more than one
582 + * channel.
583 * @NUM_NL80211_WOWLAN_TRIG: number of wake on wireless triggers
584 * @MAX_NL80211_WOWLAN_TRIG: highest wowlan trigger attribute number
585 *
586 @@ -3570,6 +3824,8 @@ enum nl80211_wowlan_triggers {
587 NL80211_WOWLAN_TRIG_WAKEUP_TCP_MATCH,
588 NL80211_WOWLAN_TRIG_WAKEUP_TCP_CONNLOST,
589 NL80211_WOWLAN_TRIG_WAKEUP_TCP_NOMORETOKENS,
590 + NL80211_WOWLAN_TRIG_NET_DETECT,
591 + NL80211_WOWLAN_TRIG_NET_DETECT_RESULTS,
592
593 /* keep last */
594 NUM_NL80211_WOWLAN_TRIG,
595 @@ -4042,6 +4298,27 @@ enum nl80211_ap_sme_features {
596 * multiplexing powersave, ie. can turn off all but one chain
597 * and then wake the rest up as required after, for example,
598 * rts/cts handshake.
599 + * @NL80211_FEATURE_SUPPORTS_WMM_ADMISSION: the device supports setting up WMM
600 + * TSPEC sessions (TID aka TSID 0-7) with the %NL80211_CMD_ADD_TX_TS
601 + * command. Standard IEEE 802.11 TSPEC setup is not yet supported, it
602 + * needs to be able to handle Block-Ack agreements and other things.
603 + * @NL80211_FEATURE_MAC_ON_CREATE: Device supports configuring
604 + * the vif's MAC address upon creation.
605 + * See 'macaddr' field in the vif_params (cfg80211.h).
606 + * @NL80211_FEATURE_TDLS_CHANNEL_SWITCH: Driver supports channel switching when
607 + * operating as a TDLS peer.
608 + * @NL80211_FEATURE_SCAN_RANDOM_MAC_ADDR: This device/driver supports using a
609 + * random MAC address during scan (if the device is unassociated); the
610 + * %NL80211_SCAN_FLAG_RANDOM_ADDR flag may be set for scans and the MAC
611 + * address mask/value will be used.
612 + * @NL80211_FEATURE_SCHED_SCAN_RANDOM_MAC_ADDR: This device/driver supports
613 + * using a random MAC address for every scan iteration during scheduled
614 + * scan (while not associated), the %NL80211_SCAN_FLAG_RANDOM_ADDR may
615 + * be set for scheduled scan and the MAC address mask/value will be used.
616 + * @NL80211_FEATURE_ND_RANDOM_MAC_ADDR: This device/driver supports using a
617 + * random MAC address for every scan iteration during "net detect", i.e.
618 + * scan in unassociated WoWLAN, the %NL80211_SCAN_FLAG_RANDOM_ADDR may
619 + * be set for scheduled scan and the MAC address mask/value will be used.
620 */
621 enum nl80211_feature_flags {
622 NL80211_FEATURE_SK_TX_STATUS = 1 << 0,
623 @@ -4070,6 +4347,27 @@ enum nl80211_feature_flags {
624 NL80211_FEATURE_ACKTO_ESTIMATION = 1 << 23,
625 NL80211_FEATURE_STATIC_SMPS = 1 << 24,
626 NL80211_FEATURE_DYNAMIC_SMPS = 1 << 25,
627 + NL80211_FEATURE_SUPPORTS_WMM_ADMISSION = 1 << 26,
628 + NL80211_FEATURE_MAC_ON_CREATE = 1 << 27,
629 + NL80211_FEATURE_TDLS_CHANNEL_SWITCH = 1 << 28,
630 + NL80211_FEATURE_SCAN_RANDOM_MAC_ADDR = 1 << 29,
631 + NL80211_FEATURE_SCHED_SCAN_RANDOM_MAC_ADDR = 1 << 30,
632 + NL80211_FEATURE_ND_RANDOM_MAC_ADDR = 1 << 31,
633 +};
634 +
635 +/**
636 + * enum nl80211_ext_feature_index - bit index of extended features.
637 + * @NL80211_EXT_FEATURE_VHT_IBSS: This driver supports IBSS with VHT datarates.
638 + *
639 + * @NUM_NL80211_EXT_FEATURES: number of extended features.
640 + * @MAX_NL80211_EXT_FEATURES: highest extended feature index.
641 + */
642 +enum nl80211_ext_feature_index {
643 + NL80211_EXT_FEATURE_VHT_IBSS,
644 +
645 + /* add new features before the definition below */
646 + NUM_NL80211_EXT_FEATURES,
647 + MAX_NL80211_EXT_FEATURES = NUM_NL80211_EXT_FEATURES - 1
648 };
649
650 /**
651 @@ -4118,11 +4416,21 @@ enum nl80211_connect_failed_reason {
652 * dangerous because will destroy stations performance as a lot of frames
653 * will be lost while scanning off-channel, therefore it must be used only
654 * when really needed
655 + * @NL80211_SCAN_FLAG_RANDOM_ADDR: use a random MAC address for this scan (or
656 + * for scheduled scan: a different one for every scan iteration). When the
657 + * flag is set, depending on device capabilities the @NL80211_ATTR_MAC and
658 + * @NL80211_ATTR_MAC_MASK attributes may also be given in which case only
659 + * the masked bits will be preserved from the MAC address and the remainder
660 + * randomised. If the attributes are not given full randomisation (46 bits,
661 + * locally administered 1, multicast 0) is assumed.
662 + * This flag must not be requested when the feature isn't supported, check
663 + * the nl80211 feature flags for the device.
664 */
665 enum nl80211_scan_flags {
666 NL80211_SCAN_FLAG_LOW_PRIORITY = 1<<0,
667 NL80211_SCAN_FLAG_FLUSH = 1<<1,
668 NL80211_SCAN_FLAG_AP = 1<<2,
669 + NL80211_SCAN_FLAG_RANDOM_ADDR = 1<<3,
670 };
671
672 /**