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
2727
2828 #include <linux/types.h>
2929
30+#define NL80211_GENL_NAME "nl80211"
31+
3032 /**
3133 * DOC: Station handling
3234 *
@@ -1429,6 +1431,11 @@ enum nl80211_commands { · 1396 unmodified lines
14291431 * @NL80211_ATTR_MAX_CRIT_PROT_DURATION: duration in milliseconds in which
14301432 * the connection should have increased reliability (u16).
14311433 *
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+ *
14321439 * @NL80211_ATTR_MAX: highest attribute number currently defined
14331440 * @__NL80211_ATTR_AFTER_LAST: internal use
14341441 */
@@ -1727,6 +1734,8 @@ enum nl80211_attrs { · 292 unmodified lines
17271734 NL80211_ATTR_CRIT_PROT_ID,
17281735 NL80211_ATTR_MAX_CRIT_PROT_DURATION,
17291736
1737+ NL80211_ATTR_PEER_AID,
1738+
17301739 /* add attributes here, update the policy in nl80211.c */
17311740
17321741 __NL80211_ATTR_AFTER_LAST,
@@ -1991,6 +2000,10 @@ enum nl80211_sta_bss_param { · 258 unmodified lines
19912000 * @NL80211_STA_INFO_PEER_PM: peer mesh STA link-specific power mode
19922001 * @NL80211_STA_INFO_NONPEER_PM: neighbor mesh STA power save mode towards
19932002 * 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.
19942007 * @__NL80211_STA_INFO_AFTER_LAST: internal
19952008 * @NL80211_STA_INFO_MAX: highest possible station info attribute
19962009 */
@@ -2020,6 +2033,8 @@ enum nl80211_sta_info { · 23 unmodified lines
20202033 NL80211_STA_INFO_NONPEER_PM,
20212034 NL80211_STA_INFO_RX_BYTES64,
20222035 NL80211_STA_INFO_TX_BYTES64,
2036+ NL80211_STA_INFO_CHAIN_SIGNAL,
2037+ NL80211_STA_INFO_CHAIN_SIGNAL_AVG,
20232038
20242039 /* keep last */
20252040 __NL80211_STA_INFO_AFTER_LAST,
@@ -2413,6 +2428,8 @@ enum nl80211_survey_info { · 387 unmodified lines
24132428 * @NL80211_MNTR_FLAG_OTHER_BSS: disable BSSID filtering
24142429 * @NL80211_MNTR_FLAG_COOK_FRAMES: report frames after processing.
24152430 * overrides all other flags.
2431+ * @NL80211_MNTR_FLAG_ACTIVE: use the configured MAC address
2432+ * and ACK incoming unicast packets.
24162433 *
24172434 * @__NL80211_MNTR_FLAG_AFTER_LAST: internal use
24182435 * @NL80211_MNTR_FLAG_MAX: highest possible monitor flag
@@ -2424,6 +2441,7 @@ enum nl80211_mntr_flags { · 5 unmodified lines
24242441 NL80211_MNTR_FLAG_CONTROL,
24252442 NL80211_MNTR_FLAG_OTHER_BSS,
24262443 NL80211_MNTR_FLAG_COOK_FRAMES,
2444+ NL80211_MNTR_FLAG_ACTIVE,
24272445
24282446 /* keep last */
24292447 __NL80211_MNTR_FLAG_AFTER_LAST,
@@ -2637,6 +2655,10 @@ enum nl80211_meshconf_params { · 207 unmodified lines
26372655 * @NL80211_MESH_SETUP_USERSPACE_MPM: Enable this option if userspace will
26382656 * implement an MPM which handles peer allocation and state.
26392657 *
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+ *
26402662 * @NL80211_MESH_SETUP_ATTR_MAX: highest possible mesh setup attribute number
26412663 *
26422664 * @__NL80211_MESH_SETUP_ATTR_AFTER_LAST: Internal use
@@ -2650,6 +2672,7 @@ enum nl80211_mesh_setup_params { · 7 unmodified lines
26502672 NL80211_MESH_SETUP_USERSPACE_AMPE,
26512673 NL80211_MESH_SETUP_ENABLE_VENDOR_SYNC,
26522674 NL80211_MESH_SETUP_USERSPACE_MPM,
2675+ NL80211_MESH_SETUP_AUTH_PROTOCOL,
26532676
26542677 /* keep last */
26552678 __NL80211_MESH_SETUP_ATTR_AFTER_LAST,
@@ -3575,6 +3598,7 @@ enum nl80211_feature_flags { · 919 unmodified lines
35753598 NL80211_FEATURE_ADVERTISE_CHAN_LIMITS = 1 << 14,
35763599 NL80211_FEATURE_FULL_AP_CLIENT_STATE = 1 << 15,
35773600 NL80211_FEATURE_USERSPACE_MPM = 1 << 16,
3601+ NL80211_FEATURE_ACTIVE_MONITOR = 1 << 17,
35783602 };
35793603
35803604 /**

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