History

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

John W. Linville committed 13 years ago

Commit 066433a2 parents aa3c90b 5a32aff32 files · +583 −274Browse files

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

Unified · Split

include/uapi/linux/nl80211.h+53−3
@@ -374,8 +374,8 @@ · 373 unmodified lines
374 * requests to connect to a specified network but without separating374 * requests to connect to a specified network but without separating
375 * auth and assoc steps. For this, you need to specify the SSID in a375 * auth and assoc steps. For this, you need to specify the SSID in a
376 * %NL80211_ATTR_SSID attribute, and can optionally specify the association376 * %NL80211_ATTR_SSID attribute, and can optionally specify the association
377 * IEs in %NL80211_ATTR_IE, %NL80211_ATTR_AUTH_TYPE, %NL80211_ATTR_MAC,377 * IEs in %NL80211_ATTR_IE, %NL80211_ATTR_AUTH_TYPE, %NL80211_ATTR_USE_MFP,
378 * %NL80211_ATTR_WIPHY_FREQ, %NL80211_ATTR_CONTROL_PORT,378 * %NL80211_ATTR_MAC, %NL80211_ATTR_WIPHY_FREQ, %NL80211_ATTR_CONTROL_PORT,
379 * %NL80211_ATTR_CONTROL_PORT_ETHERTYPE and379 * %NL80211_ATTR_CONTROL_PORT_ETHERTYPE and
380 * %NL80211_ATTR_CONTROL_PORT_NO_ENCRYPT.380 * %NL80211_ATTR_CONTROL_PORT_NO_ENCRYPT.
381 * Background scan period can optionally be381 * Background scan period can optionally be
@@ -958,7 +958,7 @@ enum nl80211_commands { · 576 unmodified lines
958 * @NL80211_ATTR_USE_MFP: Whether management frame protection (IEEE 802.11w) is958 * @NL80211_ATTR_USE_MFP: Whether management frame protection (IEEE 802.11w) is
959 * used for the association (&enum nl80211_mfp, represented as a u32);959 * used for the association (&enum nl80211_mfp, represented as a u32);
960 * this attribute can be used960 * this attribute can be used
961 * with %NL80211_CMD_ASSOCIATE request961 * with %NL80211_CMD_ASSOCIATE and %NL80211_CMD_CONNECT requests
962 *962 *
963 * @NL80211_ATTR_STA_FLAGS2: Attribute containing a963 * @NL80211_ATTR_STA_FLAGS2: Attribute containing a
964 * &struct nl80211_sta_flag_update.964 * &struct nl80211_sta_flag_update.
@@ -1310,6 +1310,9 @@ enum nl80211_commands { · 345 unmodified lines
1310 * if not given in START_AP 0 is assumed, if not given in SET_BSS1310 * if not given in START_AP 0 is assumed, if not given in SET_BSS
1311 * no change is made.1311 * no change is made.
1312 *1312 *
1313 * @NL80211_ATTR_LOCAL_MESH_POWER_MODE: local mesh STA link-specific power mode
1314 * defined in &enum nl80211_mesh_power_mode.
1315 *
1313 * @NL80211_ATTR_MAX: highest attribute number currently defined1316 * @NL80211_ATTR_MAX: highest attribute number currently defined
1314 * @__NL80211_ATTR_AFTER_LAST: internal use1317 * @__NL80211_ATTR_AFTER_LAST: internal use
1315 */1318 */
@@ -1580,6 +1583,8 @@ enum nl80211_attrs { · 264 unmodified lines
1580 NL80211_ATTR_P2P_CTWINDOW,1583 NL80211_ATTR_P2P_CTWINDOW,
1581 NL80211_ATTR_P2P_OPPPS,1584 NL80211_ATTR_P2P_OPPPS,
1582 1585
1586 NL80211_ATTR_LOCAL_MESH_POWER_MODE,
1587
1583 /* add attributes here, update the policy in nl80211.c */1588 /* add attributes here, update the policy in nl80211.c */
1584 1589
1585 __NL80211_ATTR_AFTER_LAST,1590 __NL80211_ATTR_AFTER_LAST,
@@ -1838,6 +1843,10 @@ enum nl80211_sta_bss_param { · 252 unmodified lines
1838 * @NL80211_STA_INFO_STA_FLAGS: Contains a struct nl80211_sta_flag_update.1843 * @NL80211_STA_INFO_STA_FLAGS: Contains a struct nl80211_sta_flag_update.
1839 * @NL80211_STA_INFO_BEACON_LOSS: count of times beacon loss was detected (u32)1844 * @NL80211_STA_INFO_BEACON_LOSS: count of times beacon loss was detected (u32)
1840 * @NL80211_STA_INFO_T_OFFSET: timing offset with respect to this STA (s64)1845 * @NL80211_STA_INFO_T_OFFSET: timing offset with respect to this STA (s64)
1846 * @NL80211_STA_INFO_LOCAL_PM: local mesh STA link-specific power mode
1847 * @NL80211_STA_INFO_PEER_PM: peer mesh STA link-specific power mode
1848 * @NL80211_STA_INFO_NONPEER_PM: neighbor mesh STA power save mode towards
1849 * non-peer STA
1841 * @__NL80211_STA_INFO_AFTER_LAST: internal1850 * @__NL80211_STA_INFO_AFTER_LAST: internal
1842 * @NL80211_STA_INFO_MAX: highest possible station info attribute1851 * @NL80211_STA_INFO_MAX: highest possible station info attribute
1843 */1852 */
@@ -1862,6 +1871,9 @@ enum nl80211_sta_info { · 18 unmodified lines
1862 NL80211_STA_INFO_STA_FLAGS,1871 NL80211_STA_INFO_STA_FLAGS,
1863 NL80211_STA_INFO_BEACON_LOSS,1872 NL80211_STA_INFO_BEACON_LOSS,
1864 NL80211_STA_INFO_T_OFFSET,1873 NL80211_STA_INFO_T_OFFSET,
1874 NL80211_STA_INFO_LOCAL_PM,
1875 NL80211_STA_INFO_PEER_PM,
1876 NL80211_STA_INFO_NONPEER_PM,
1865 1877
1866 /* keep last */1878 /* keep last */
1867 __NL80211_STA_INFO_AFTER_LAST,1879 __NL80211_STA_INFO_AFTER_LAST,
@@ -2252,6 +2264,34 @@ enum nl80211_mntr_flags { · 384 unmodified lines
2252 NL80211_MNTR_FLAG_MAX = __NL80211_MNTR_FLAG_AFTER_LAST - 12264 NL80211_MNTR_FLAG_MAX = __NL80211_MNTR_FLAG_AFTER_LAST - 1
2253};2265};
2254 2266
2267/**
2268 * enum nl80211_mesh_power_mode - mesh power save modes
2269 *
2270 * @NL80211_MESH_POWER_UNKNOWN: The mesh power mode of the mesh STA is
2271 * not known or has not been set yet.
2272 * @NL80211_MESH_POWER_ACTIVE: Active mesh power mode. The mesh STA is
2273 * in Awake state all the time.
2274 * @NL80211_MESH_POWER_LIGHT_SLEEP: Light sleep mode. The mesh STA will
2275 * alternate between Active and Doze states, but will wake up for
2276 * neighbor's beacons.
2277 * @NL80211_MESH_POWER_DEEP_SLEEP: Deep sleep mode. The mesh STA will
2278 * alternate between Active and Doze states, but may not wake up
2279 * for neighbor's beacons.
2280 *
2281 * @__NL80211_MESH_POWER_AFTER_LAST - internal use
2282 * @NL80211_MESH_POWER_MAX - highest possible power save level
2283 */
2284
2285enum nl80211_mesh_power_mode {
2286 NL80211_MESH_POWER_UNKNOWN,
2287 NL80211_MESH_POWER_ACTIVE,
2288 NL80211_MESH_POWER_LIGHT_SLEEP,
2289 NL80211_MESH_POWER_DEEP_SLEEP,
2290
2291 __NL80211_MESH_POWER_AFTER_LAST,
2292 NL80211_MESH_POWER_MAX = __NL80211_MESH_POWER_AFTER_LAST - 1
2293};
2294
2255/**2295/**
2256 * enum nl80211_meshconf_params - mesh configuration parameters2296 * enum nl80211_meshconf_params - mesh configuration parameters
2257 *2297 *
@@ -2346,6 +2386,11 @@ enum nl80211_mntr_flags { · 88 unmodified lines
2346 * (in TUs) during which a mesh STA can send only one Action frame2386 * (in TUs) during which a mesh STA can send only one Action frame
2347 * containing a PREQ element for root path confirmation.2387 * containing a PREQ element for root path confirmation.
2348 *2388 *
2389 * @NL80211_MESHCONF_POWER_MODE: Default mesh power mode for new peer links.
2390 * type &enum nl80211_mesh_power_mode (u32)
2391 *
2392 * @NL80211_MESHCONF_AWAKE_WINDOW: awake window duration (in TUs)
2393 *
2349 * @__NL80211_MESHCONF_ATTR_AFTER_LAST: internal use2394 * @__NL80211_MESHCONF_ATTR_AFTER_LAST: internal use
2350 */2395 */
2351enum nl80211_meshconf_params {2396enum nl80211_meshconf_params {
@@ -2375,6 +2420,8 @@ enum nl80211_meshconf_params { · 23 unmodified lines
2375 NL80211_MESHCONF_HWMP_PATH_TO_ROOT_TIMEOUT,2420 NL80211_MESHCONF_HWMP_PATH_TO_ROOT_TIMEOUT,
2376 NL80211_MESHCONF_HWMP_ROOT_INTERVAL,2421 NL80211_MESHCONF_HWMP_ROOT_INTERVAL,
2377 NL80211_MESHCONF_HWMP_CONFIRMATION_INTERVAL,2422 NL80211_MESHCONF_HWMP_CONFIRMATION_INTERVAL,
2423 NL80211_MESHCONF_POWER_MODE,
2424 NL80211_MESHCONF_AWAKE_WINDOW,
2378 2425
2379 /* keep last */2426 /* keep last */
2380 __NL80211_MESHCONF_ATTR_AFTER_LAST,2427 __NL80211_MESHCONF_ATTR_AFTER_LAST,
@@ -2937,6 +2984,8 @@ enum nl80211_iface_limit_attrs { · 556 unmodified lines
2937 * the infrastructure network's beacon interval.2984 * the infrastructure network's beacon interval.
2938 * @NL80211_IFACE_COMB_NUM_CHANNELS: u32 attribute specifying how many2985 * @NL80211_IFACE_COMB_NUM_CHANNELS: u32 attribute specifying how many
2939 * different channels may be used within this group.2986 * different channels may be used within this group.
2987 * @NL80211_IFACE_COMB_RADAR_DETECT_WIDTHS: u32 attribute containing the bitmap
2988 * of supported channel widths for radar detection.
2940 * @NUM_NL80211_IFACE_COMB: number of attributes2989 * @NUM_NL80211_IFACE_COMB: number of attributes
2941 * @MAX_NL80211_IFACE_COMB: highest attribute number2990 * @MAX_NL80211_IFACE_COMB: highest attribute number
2942 *2991 *
@@ -2969,6 +3018,7 @@ enum nl80211_if_combination_attrs { · 26 unmodified lines
2969 NL80211_IFACE_COMB_MAXNUM,3018 NL80211_IFACE_COMB_MAXNUM,
2970 NL80211_IFACE_COMB_STA_AP_BI_MATCH,3019 NL80211_IFACE_COMB_STA_AP_BI_MATCH,
2971 NL80211_IFACE_COMB_NUM_CHANNELS,3020 NL80211_IFACE_COMB_NUM_CHANNELS,
3021 NL80211_IFACE_COMB_RADAR_DETECT_WIDTHS,
2972 3022
2973 /* keep last */3023 /* keep last */
2974 NUM_NL80211_IFACE_COMB,3024 NUM_NL80211_IFACE_COMB,

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