backport mac80211, hostapd, iw, crda from trunk as of r26369
[openwrt/svn-archive/archive.git] / package / iw / patches / 001-nl80211_sync.patch
1 --- a/nl80211.h
2 +++ b/nl80211.h
3 @@ -148,6 +148,10 @@
4 * @NL80211_CMD_SET_MPATH: Set mesh path attributes for mesh path to
5 * destination %NL80211_ATTR_MAC on the interface identified by
6 * %NL80211_ATTR_IFINDEX.
7 + * @NL80211_CMD_NEW_MPATH: Create a new mesh path for the destination given by
8 + * %NL80211_ATTR_MAC via %NL80211_ATTR_MPATH_NEXT_HOP.
9 + * @NL80211_CMD_DEL_MPATH: Delete a mesh path to the destination given by
10 + * %NL80211_ATTR_MAC.
11 * @NL80211_CMD_NEW_PATH: Add a mesh path with given attributes to the
12 * the interface identified by %NL80211_ATTR_IFINDEX.
13 * @NL80211_CMD_DEL_PATH: Remove a mesh path identified by %NL80211_ATTR_MAC
14 @@ -612,7 +616,7 @@ enum nl80211_commands {
15 * consisting of a nested array.
16 *
17 * @NL80211_ATTR_MESH_ID: mesh id (1-32 bytes).
18 - * @NL80211_ATTR_PLINK_ACTION: action to perform on the mesh peer link.
19 + * @NL80211_ATTR_STA_PLINK_ACTION: action to perform on the mesh peer link.
20 * @NL80211_ATTR_MPATH_NEXT_HOP: MAC address of the next hop for a mesh path.
21 * @NL80211_ATTR_MPATH_INFO: information about a mesh_path, part of mesh path
22 * info given for %NL80211_CMD_GET_MPATH, nested attribute described at
23 @@ -879,7 +883,9 @@ enum nl80211_commands {
24 * See &enum nl80211_key_default_types.
25 *
26 * @NL80211_ATTR_MESH_SETUP: Optional mesh setup parameters. These cannot be
27 - * changed once the mesh is active.
28 + * changed once the mesh is active.
29 + * @NL80211_ATTR_MESH_CONFIG: Mesh configuration parameters, a nested attribute
30 + * containing attributes from &enum nl80211_meshconf_params.
31 *
32 * @NL80211_ATTR_MAX: highest attribute number currently defined
33 * @__NL80211_ATTR_AFTER_LAST: internal use
34 @@ -1225,8 +1231,6 @@ enum nl80211_rate_info {
35 * @NL80211_STA_INFO_INACTIVE_TIME: time since last activity (u32, msecs)
36 * @NL80211_STA_INFO_RX_BYTES: total received bytes (u32, from this station)
37 * @NL80211_STA_INFO_TX_BYTES: total transmitted bytes (u32, to this station)
38 - * @__NL80211_STA_INFO_AFTER_LAST: internal
39 - * @NL80211_STA_INFO_MAX: highest possible station info attribute
40 * @NL80211_STA_INFO_SIGNAL: signal strength of last received PPDU (u8, dBm)
41 * @NL80211_STA_INFO_TX_BITRATE: current unicast tx rate, nested attribute
42 * containing info as possible, see &enum nl80211_sta_info_txrate.
43 @@ -1236,6 +1240,13 @@ enum nl80211_rate_info {
44 * @NL80211_STA_INFO_TX_RETRIES: total retries (u32, to this station)
45 * @NL80211_STA_INFO_TX_FAILED: total failed packets (u32, to this station)
46 * @NL80211_STA_INFO_SIGNAL_AVG: signal strength average (u8, dBm)
47 + * @NL80211_STA_INFO_LLID: the station's mesh LLID
48 + * @NL80211_STA_INFO_PLID: the station's mesh PLID
49 + * @NL80211_STA_INFO_PLINK_STATE: peer link state for the station
50 + * @NL80211_STA_INFO_RX_BITRATE: last unicast rx rate, nested attribute
51 + * containing info as possible, see &enum nl80211_sta_info_txrate.
52 + * @__NL80211_STA_INFO_AFTER_LAST: internal
53 + * @NL80211_STA_INFO_MAX: highest possible station info attribute
54 */
55 enum nl80211_sta_info {
56 __NL80211_STA_INFO_INVALID,
57 @@ -1252,6 +1263,7 @@ enum nl80211_sta_info {
58 NL80211_STA_INFO_TX_RETRIES,
59 NL80211_STA_INFO_TX_FAILED,
60 NL80211_STA_INFO_SIGNAL_AVG,
61 + NL80211_STA_INFO_RX_BITRATE,
62
63 /* keep last */
64 __NL80211_STA_INFO_AFTER_LAST,
65 @@ -1626,7 +1638,7 @@ enum nl80211_mntr_flags {
66 * @NL80211_MESHCONF_HWMP_NET_DIAM_TRVS_TIME: The interval of time (in TUs)
67 * that it takes for an HWMP information element to propagate across the mesh
68 *
69 - * @NL80211_MESHCONF_ROOTMODE: whether root mode is enabled or not
70 + * @NL80211_MESHCONF_HWMP_ROOTMODE: whether root mode is enabled or not
71 *
72 * @NL80211_MESHCONF_ELEMENT_TTL: specifies the value of TTL field set at a
73 * source mesh point for path selection elements.
74 @@ -1678,6 +1690,7 @@ enum nl80211_meshconf_params {
75 * element that vendors will use to identify the path selection methods and
76 * metrics in use.
77 *
78 + * @NL80211_MESH_SETUP_ATTR_MAX: highest possible mesh setup attribute number
79 * @__NL80211_MESH_SETUP_ATTR_AFTER_LAST: Internal use
80 */
81 enum nl80211_mesh_setup_params {