iw: update to 0.9.21, add support for showing the in-use flag for survey data
[openwrt/svn-archive/archive.git] / package / iw / patches / 001-nl80211_sync.patch
1 --- a/nl80211.h
2 +++ b/nl80211.h
3 @@ -295,7 +295,9 @@
4 * auth and assoc steps. For this, you need to specify the SSID in a
5 * %NL80211_ATTR_SSID attribute, and can optionally specify the association
6 * IEs in %NL80211_ATTR_IE, %NL80211_ATTR_AUTH_TYPE, %NL80211_ATTR_MAC,
7 - * %NL80211_ATTR_WIPHY_FREQ and %NL80211_ATTR_CONTROL_PORT.
8 + * %NL80211_ATTR_WIPHY_FREQ, %NL80211_ATTR_CONTROL_PORT,
9 + * %NL80211_ATTR_CONTROL_PORT_ETHERTYPE and
10 + * %NL80211_ATTR_CONTROL_PORT_NO_ENCRYPT.
11 * It is also sent as an event, with the BSSID and response IEs when the
12 * connection is established or failed to be established. This can be
13 * determined by the STATUS_CODE attribute.
14 @@ -686,6 +688,15 @@ enum nl80211_commands {
15 * request, the driver will assume that the port is unauthorized until
16 * authorized by user space. Otherwise, port is marked authorized by
17 * default in station mode.
18 + * @NL80211_ATTR_CONTROL_PORT_ETHERTYPE: A 16-bit value indicating the
19 + * ethertype that will be used for key negotiation. It can be
20 + * specified with the associate and connect commands. If it is not
21 + * specified, the value defaults to 0x888E (PAE, 802.1X). This
22 + * attribute is also used as a flag in the wiphy information to
23 + * indicate that protocols other than PAE are supported.
24 + * @NL80211_ATTR_CONTROL_PORT_NO_ENCRYPT: When included along with
25 + * %NL80211_ATTR_CONTROL_PORT_ETHERTYPE, indicates that the custom
26 + * ethertype frames used for key negotiation must not be encrypted.
27 *
28 * @NL80211_ATTR_TESTDATA: Testmode data blob, passed through to the driver.
29 * We recommend using nested, driver-specific attributes within this.
30 @@ -951,6 +962,9 @@ enum nl80211_attrs {
31 NL80211_ATTR_RX_FRAME_TYPES,
32 NL80211_ATTR_FRAME_TYPE,
33
34 + NL80211_ATTR_CONTROL_PORT_ETHERTYPE,
35 + NL80211_ATTR_CONTROL_PORT_NO_ENCRYPT,
36 +
37 /* add attributes here, update the policy in nl80211.c */
38
39 __NL80211_ATTR_AFTER_LAST,
40 @@ -1006,6 +1020,8 @@ enum nl80211_attrs {
41 * @NL80211_IFTYPE_WDS: wireless distribution interface
42 * @NL80211_IFTYPE_MONITOR: monitor interface receiving all frames
43 * @NL80211_IFTYPE_MESH_POINT: mesh point
44 + * @NL80211_IFTYPE_P2P_CLIENT: P2P client
45 + * @NL80211_IFTYPE_P2P_GO: P2P group owner
46 * @NL80211_IFTYPE_MAX: highest interface type number currently defined
47 * @NUM_NL80211_IFTYPES: number of defined interface types
48 *
49 @@ -1022,6 +1038,8 @@ enum nl80211_iftype {
50 NL80211_IFTYPE_WDS,
51 NL80211_IFTYPE_MONITOR,
52 NL80211_IFTYPE_MESH_POINT,
53 + NL80211_IFTYPE_P2P_CLIENT,
54 + NL80211_IFTYPE_P2P_GO,
55
56 /* keep last */
57 NUM_NL80211_IFTYPES,
58 @@ -1382,6 +1400,7 @@ enum nl80211_reg_rule_flags {
59 * @__NL80211_SURVEY_INFO_INVALID: attribute number 0 is reserved
60 * @NL80211_SURVEY_INFO_FREQUENCY: center frequency of channel
61 * @NL80211_SURVEY_INFO_NOISE: noise level of channel (u8, dBm)
62 + * @NL80211_SURVEY_INFO_IN_USE: channel is currently being used
63 * @NL80211_SURVEY_INFO_MAX: highest survey info attribute number
64 * currently defined
65 * @__NL80211_SURVEY_INFO_AFTER_LAST: internal use
66 @@ -1390,6 +1409,7 @@ enum nl80211_survey_info {
67 __NL80211_SURVEY_INFO_INVALID,
68 NL80211_SURVEY_INFO_FREQUENCY,
69 NL80211_SURVEY_INFO_NOISE,
70 + NL80211_SURVEY_INFO_IN_USE,
71
72 /* keep last */
73 __NL80211_SURVEY_INFO_AFTER_LAST,