History

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem

John W. Linville committed 13 years ago

Commit 3899ba92 parents 45203a3 8b3e7be206 files · +19923 −3391Browse files

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

Unified · Split

include/uapi/linux/nl80211.h+24−0
@@ -27,6 +27,8 @@ · 26 unmodified lines
27 27
28#include <linux/types.h>28#include <linux/types.h>
29 29
30#define NL80211_GENL_NAME "nl80211"
31
30/**32/**
31 * DOC: Station handling33 * DOC: Station handling
32 *34 *
@@ -1429,6 +1431,11 @@ enum nl80211_commands { · 1396 unmodified lines
1429 * @NL80211_ATTR_MAX_CRIT_PROT_DURATION: duration in milliseconds in which1431 * @NL80211_ATTR_MAX_CRIT_PROT_DURATION: duration in milliseconds in which
1430 * the connection should have increased reliability (u16).1432 * the connection should have increased reliability (u16).
1431 *1433 *
1434 * @NL80211_ATTR_PEER_AID: Association ID for the peer TDLS station (u16).
1435 * This is similar to @NL80211_ATTR_STA_AID but with a difference of being
1436 * allowed to be used with the first @NL80211_CMD_SET_STATION command to
1437 * update a TDLS peer STA entry.
1438 *
1432 * @NL80211_ATTR_MAX: highest attribute number currently defined1439 * @NL80211_ATTR_MAX: highest attribute number currently defined
1433 * @__NL80211_ATTR_AFTER_LAST: internal use1440 * @__NL80211_ATTR_AFTER_LAST: internal use
1434 */1441 */
@@ -1727,6 +1734,8 @@ enum nl80211_attrs { · 292 unmodified lines
1727 NL80211_ATTR_CRIT_PROT_ID,1734 NL80211_ATTR_CRIT_PROT_ID,
1728 NL80211_ATTR_MAX_CRIT_PROT_DURATION,1735 NL80211_ATTR_MAX_CRIT_PROT_DURATION,
1729 1736
1737 NL80211_ATTR_PEER_AID,
1738
1730 /* add attributes here, update the policy in nl80211.c */1739 /* add attributes here, update the policy in nl80211.c */
1731 1740
1732 __NL80211_ATTR_AFTER_LAST,1741 __NL80211_ATTR_AFTER_LAST,
@@ -1991,6 +2000,10 @@ enum nl80211_sta_bss_param { · 258 unmodified lines
1991 * @NL80211_STA_INFO_PEER_PM: peer mesh STA link-specific power mode2000 * @NL80211_STA_INFO_PEER_PM: peer mesh STA link-specific power mode
1992 * @NL80211_STA_INFO_NONPEER_PM: neighbor mesh STA power save mode towards2001 * @NL80211_STA_INFO_NONPEER_PM: neighbor mesh STA power save mode towards
1993 * non-peer STA2002 * non-peer STA
2003 * @NL80211_STA_INFO_CHAIN_SIGNAL: per-chain signal strength of last PPDU
2004 * Contains a nested array of signal strength attributes (u8, dBm)
2005 * @NL80211_STA_INFO_CHAIN_SIGNAL_AVG: per-chain signal strength average
2006 * Same format as NL80211_STA_INFO_CHAIN_SIGNAL.
1994 * @__NL80211_STA_INFO_AFTER_LAST: internal2007 * @__NL80211_STA_INFO_AFTER_LAST: internal
1995 * @NL80211_STA_INFO_MAX: highest possible station info attribute2008 * @NL80211_STA_INFO_MAX: highest possible station info attribute
1996 */2009 */
@@ -2020,6 +2033,8 @@ enum nl80211_sta_info { · 23 unmodified lines
2020 NL80211_STA_INFO_NONPEER_PM,2033 NL80211_STA_INFO_NONPEER_PM,
2021 NL80211_STA_INFO_RX_BYTES64,2034 NL80211_STA_INFO_RX_BYTES64,
2022 NL80211_STA_INFO_TX_BYTES64,2035 NL80211_STA_INFO_TX_BYTES64,
2036 NL80211_STA_INFO_CHAIN_SIGNAL,
2037 NL80211_STA_INFO_CHAIN_SIGNAL_AVG,
2023 2038
2024 /* keep last */2039 /* keep last */
2025 __NL80211_STA_INFO_AFTER_LAST,2040 __NL80211_STA_INFO_AFTER_LAST,
@@ -2413,6 +2428,8 @@ enum nl80211_survey_info { · 387 unmodified lines
2413 * @NL80211_MNTR_FLAG_OTHER_BSS: disable BSSID filtering2428 * @NL80211_MNTR_FLAG_OTHER_BSS: disable BSSID filtering
2414 * @NL80211_MNTR_FLAG_COOK_FRAMES: report frames after processing.2429 * @NL80211_MNTR_FLAG_COOK_FRAMES: report frames after processing.
2415 * overrides all other flags.2430 * overrides all other flags.
2431 * @NL80211_MNTR_FLAG_ACTIVE: use the configured MAC address
2432 * and ACK incoming unicast packets.
2416 *2433 *
2417 * @__NL80211_MNTR_FLAG_AFTER_LAST: internal use2434 * @__NL80211_MNTR_FLAG_AFTER_LAST: internal use
2418 * @NL80211_MNTR_FLAG_MAX: highest possible monitor flag2435 * @NL80211_MNTR_FLAG_MAX: highest possible monitor flag
@@ -2424,6 +2441,7 @@ enum nl80211_mntr_flags { · 5 unmodified lines
2424 NL80211_MNTR_FLAG_CONTROL,2441 NL80211_MNTR_FLAG_CONTROL,
2425 NL80211_MNTR_FLAG_OTHER_BSS,2442 NL80211_MNTR_FLAG_OTHER_BSS,
2426 NL80211_MNTR_FLAG_COOK_FRAMES,2443 NL80211_MNTR_FLAG_COOK_FRAMES,
2444 NL80211_MNTR_FLAG_ACTIVE,
2427 2445
2428 /* keep last */2446 /* keep last */
2429 __NL80211_MNTR_FLAG_AFTER_LAST,2447 __NL80211_MNTR_FLAG_AFTER_LAST,
@@ -2637,6 +2655,10 @@ enum nl80211_meshconf_params { · 207 unmodified lines
2637 * @NL80211_MESH_SETUP_USERSPACE_MPM: Enable this option if userspace will2655 * @NL80211_MESH_SETUP_USERSPACE_MPM: Enable this option if userspace will
2638 * implement an MPM which handles peer allocation and state.2656 * implement an MPM which handles peer allocation and state.
2639 *2657 *
2658 * @NL80211_MESH_SETUP_AUTH_PROTOCOL: Inform the kernel of the authentication
2659 * method (u8, as defined in IEEE 8.4.2.100.6, e.g. 0x1 for SAE).
2660 * Default is no authentication method required.
2661 *
2640 * @NL80211_MESH_SETUP_ATTR_MAX: highest possible mesh setup attribute number2662 * @NL80211_MESH_SETUP_ATTR_MAX: highest possible mesh setup attribute number
2641 *2663 *
2642 * @__NL80211_MESH_SETUP_ATTR_AFTER_LAST: Internal use2664 * @__NL80211_MESH_SETUP_ATTR_AFTER_LAST: Internal use
@@ -2650,6 +2672,7 @@ enum nl80211_mesh_setup_params { · 7 unmodified lines
2650 NL80211_MESH_SETUP_USERSPACE_AMPE,2672 NL80211_MESH_SETUP_USERSPACE_AMPE,
2651 NL80211_MESH_SETUP_ENABLE_VENDOR_SYNC,2673 NL80211_MESH_SETUP_ENABLE_VENDOR_SYNC,
2652 NL80211_MESH_SETUP_USERSPACE_MPM,2674 NL80211_MESH_SETUP_USERSPACE_MPM,
2675 NL80211_MESH_SETUP_AUTH_PROTOCOL,
2653 2676
2654 /* keep last */2677 /* keep last */
2655 __NL80211_MESH_SETUP_ATTR_AFTER_LAST,2678 __NL80211_MESH_SETUP_ATTR_AFTER_LAST,
@@ -3575,6 +3598,7 @@ enum nl80211_feature_flags { · 919 unmodified lines
3575 NL80211_FEATURE_ADVERTISE_CHAN_LIMITS = 1 << 14,3598 NL80211_FEATURE_ADVERTISE_CHAN_LIMITS = 1 << 14,
3576 NL80211_FEATURE_FULL_AP_CLIENT_STATE = 1 << 15,3599 NL80211_FEATURE_FULL_AP_CLIENT_STATE = 1 << 15,
3577 NL80211_FEATURE_USERSPACE_MPM = 1 << 16,3600 NL80211_FEATURE_USERSPACE_MPM = 1 << 16,
3601 NL80211_FEATURE_ACTIVE_MONITOR = 1 << 17,
3578};3602};
3579 3603
3580/**3604/**

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t