History

Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next

John W. Linville committed 12 years ago

Commit 4b074b02 parents 7d68849 ddcc34781 files · +2897 −1386Browse files

Showing the changes to include/uapi/linux (1 of 81 files). Show all

Unified · Split

include/uapi/linux/nl80211.h+36−11
@@ -581,7 +581,14 @@ · 580 unmodified lines
581 * operation, %NL80211_ATTR_MAC contains the peer MAC address, and581 * operation, %NL80211_ATTR_MAC contains the peer MAC address, and
582 * %NL80211_ATTR_REASON_CODE the reason code to be used (only with582 * %NL80211_ATTR_REASON_CODE the reason code to be used (only with
583 * %NL80211_TDLS_TEARDOWN).583 * %NL80211_TDLS_TEARDOWN).
584 * @NL80211_CMD_TDLS_MGMT: Send a TDLS management frame.584 * @NL80211_CMD_TDLS_MGMT: Send a TDLS management frame. The
585 * %NL80211_ATTR_TDLS_ACTION attribute determines the type of frame to be
586 * sent. Public Action codes (802.11-2012 8.1.5.1) will be sent as
587 * 802.11 management frames, while TDLS action codes (802.11-2012
588 * 8.5.13.1) will be encapsulated and sent as data frames. The currently
589 * supported Public Action code is %WLAN_PUB_ACTION_TDLS_DISCOVER_RES
590 * and the currently supported TDLS actions codes are given in
591 * &enum ieee80211_tdls_actioncode.
585 *592 *
586 * @NL80211_CMD_UNEXPECTED_FRAME: Used by an application controlling an AP593 * @NL80211_CMD_UNEXPECTED_FRAME: Used by an application controlling an AP
587 * (or GO) interface (i.e. hostapd) to ask for unexpected frames to594 * (or GO) interface (i.e. hostapd) to ask for unexpected frames to
@@ -1508,6 +1515,11 @@ enum nl80211_commands { · 920 unmodified lines
1508 * to react to radar events, e.g. initiate a channel switch or leave the1515 * to react to radar events, e.g. initiate a channel switch or leave the
1509 * IBSS network.1516 * IBSS network.
1510 *1517 *
1518 * @NL80211_ATTR_SUPPORT_5_MHZ: A flag indicating that the device supports
1519 * 5 MHz channel bandwidth.
1520 * @NL80211_ATTR_SUPPORT_10_MHZ: A flag indicating that the device supports
1521 * 10 MHz channel bandwidth.
1522 *
1511 * @NL80211_ATTR_MAX: highest attribute number currently defined1523 * @NL80211_ATTR_MAX: highest attribute number currently defined
1512 * @__NL80211_ATTR_AFTER_LAST: internal use1524 * @__NL80211_ATTR_AFTER_LAST: internal use
1513 */1525 */
@@ -1824,6 +1836,9 @@ enum nl80211_attrs { · 310 unmodified lines
1824 1836
1825 NL80211_ATTR_HANDLE_DFS,1837 NL80211_ATTR_HANDLE_DFS,
1826 1838
1839 NL80211_ATTR_SUPPORT_5_MHZ,
1840 NL80211_ATTR_SUPPORT_10_MHZ,
1841
1827 /* add attributes here, update the policy in nl80211.c */1842 /* add attributes here, update the policy in nl80211.c */
1828 1843
1829 __NL80211_ATTR_AFTER_LAST,1844 __NL80211_ATTR_AFTER_LAST,
@@ -2224,10 +2239,9 @@ enum nl80211_band_attr { · 394 unmodified lines
2224 * @NL80211_FREQUENCY_ATTR_FREQ: Frequency in MHz2239 * @NL80211_FREQUENCY_ATTR_FREQ: Frequency in MHz
2225 * @NL80211_FREQUENCY_ATTR_DISABLED: Channel is disabled in current2240 * @NL80211_FREQUENCY_ATTR_DISABLED: Channel is disabled in current
2226 * regulatory domain.2241 * regulatory domain.
2227 * @NL80211_FREQUENCY_ATTR_PASSIVE_SCAN: Only passive scanning is2242 * @NL80211_FREQUENCY_ATTR_NO_IR: no mechanisms that initiate radiation
2228 * permitted on this channel in current regulatory domain.2243 * are permitted on this channel, this includes sending probe
2229 * @NL80211_FREQUENCY_ATTR_NO_IBSS: IBSS networks are not permitted2244 * requests, or modes of operation that require beaconing.
2230 * on this channel in current regulatory domain.
2231 * @NL80211_FREQUENCY_ATTR_RADAR: Radar detection is mandatory2245 * @NL80211_FREQUENCY_ATTR_RADAR: Radar detection is mandatory
2232 * on this channel in current regulatory domain.2246 * on this channel in current regulatory domain.
2233 * @NL80211_FREQUENCY_ATTR_MAX_TX_POWER: Maximum transmission power in mBm2247 * @NL80211_FREQUENCY_ATTR_MAX_TX_POWER: Maximum transmission power in mBm
@@ -2254,8 +2268,8 @@ enum nl80211_frequency_attr { · 20 unmodified lines
2254 __NL80211_FREQUENCY_ATTR_INVALID,2268 __NL80211_FREQUENCY_ATTR_INVALID,
2255 NL80211_FREQUENCY_ATTR_FREQ,2269 NL80211_FREQUENCY_ATTR_FREQ,
2256 NL80211_FREQUENCY_ATTR_DISABLED,2270 NL80211_FREQUENCY_ATTR_DISABLED,
2257 NL80211_FREQUENCY_ATTR_PASSIVE_SCAN,2271 NL80211_FREQUENCY_ATTR_NO_IR,
2258 NL80211_FREQUENCY_ATTR_NO_IBSS,2272 __NL80211_FREQUENCY_ATTR_NO_IBSS,
2259 NL80211_FREQUENCY_ATTR_RADAR,2273 NL80211_FREQUENCY_ATTR_RADAR,
2260 NL80211_FREQUENCY_ATTR_MAX_TX_POWER,2274 NL80211_FREQUENCY_ATTR_MAX_TX_POWER,
2261 NL80211_FREQUENCY_ATTR_DFS_STATE,2275 NL80211_FREQUENCY_ATTR_DFS_STATE,
@@ -2271,6 +2285,9 @@ enum nl80211_frequency_attr { · 9 unmodified lines
2271};2285};
2272 2286
2273#define NL80211_FREQUENCY_ATTR_MAX_TX_POWER NL80211_FREQUENCY_ATTR_MAX_TX_POWER2287#define NL80211_FREQUENCY_ATTR_MAX_TX_POWER NL80211_FREQUENCY_ATTR_MAX_TX_POWER
2288#define NL80211_FREQUENCY_ATTR_PASSIVE_SCAN NL80211_FREQUENCY_ATTR_NO_IR
2289#define NL80211_FREQUENCY_ATTR_NO_IBSS NL80211_FREQUENCY_ATTR_NO_IR
2290#define NL80211_FREQUENCY_ATTR_NO_IR NL80211_FREQUENCY_ATTR_NO_IR
2274 2291
2275/**2292/**
2276 * enum nl80211_bitrate_attr - bitrate attributes2293 * enum nl80211_bitrate_attr - bitrate attributes
@@ -2413,8 +2430,9 @@ enum nl80211_sched_scan_match_attr { · 136 unmodified lines
2413 * @NL80211_RRF_DFS: DFS support is required to be used2430 * @NL80211_RRF_DFS: DFS support is required to be used
2414 * @NL80211_RRF_PTP_ONLY: this is only for Point To Point links2431 * @NL80211_RRF_PTP_ONLY: this is only for Point To Point links
2415 * @NL80211_RRF_PTMP_ONLY: this is only for Point To Multi Point links2432 * @NL80211_RRF_PTMP_ONLY: this is only for Point To Multi Point links
2416 * @NL80211_RRF_PASSIVE_SCAN: passive scan is required2433 * @NL80211_RRF_NO_IR: no mechanisms that initiate radiation are allowed,
2417 * @NL80211_RRF_NO_IBSS: no IBSS is allowed2434 * this includes probe requests or modes of operation that require
2435 * beaconing.
2418 */2436 */
2419enum nl80211_reg_rule_flags {2437enum nl80211_reg_rule_flags {
2420 NL80211_RRF_NO_OFDM = 1<<0,2438 NL80211_RRF_NO_OFDM = 1<<0,
@@ -2424,10 +2442,17 @@ enum nl80211_reg_rule_flags { · 3 unmodified lines
2424 NL80211_RRF_DFS = 1<<4,2442 NL80211_RRF_DFS = 1<<4,
2425 NL80211_RRF_PTP_ONLY = 1<<5,2443 NL80211_RRF_PTP_ONLY = 1<<5,
2426 NL80211_RRF_PTMP_ONLY = 1<<6,2444 NL80211_RRF_PTMP_ONLY = 1<<6,
2427 NL80211_RRF_PASSIVE_SCAN = 1<<7,2445 NL80211_RRF_NO_IR = 1<<7,
2428 NL80211_RRF_NO_IBSS = 1<<8,2446 __NL80211_RRF_NO_IBSS = 1<<8,
2429};2447};
2430 2448
2449#define NL80211_RRF_PASSIVE_SCAN NL80211_RRF_NO_IR
2450#define NL80211_RRF_NO_IBSS NL80211_RRF_NO_IR
2451#define NL80211_RRF_NO_IR NL80211_RRF_NO_IR
2452
2453/* For backport compatibility with older userspace */
2454#define NL80211_RRF_NO_IR_ALL (NL80211_RRF_NO_IR | __NL80211_RRF_NO_IBSS)
2455
2431/**2456/**
2432 * enum nl80211_dfs_regions - regulatory DFS regions2457 * enum nl80211_dfs_regions - regulatory DFS regions
2433 *2458 *