From b138bca2908456bf7f7a90089e42efd3e8a05c48 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Mon, 16 Apr 2012 21:13:18 +0000 Subject: [PATCH] iw: sync nl80211.h update with compat-wireless SVN-Revision: 31323 --- package/iw/patches/001-nl80211_h_sync.patch | 221 +++++++++++++++++++- 1 file changed, 214 insertions(+), 7 deletions(-) diff --git a/package/iw/patches/001-nl80211_h_sync.patch b/package/iw/patches/001-nl80211_h_sync.patch index 544df9dffa..cccc144756 100644 --- a/package/iw/patches/001-nl80211_h_sync.patch +++ b/package/iw/patches/001-nl80211_h_sync.patch @@ -1,6 +1,121 @@ --- a/nl80211.h +++ b/nl80211.h -@@ -1475,6 +1475,7 @@ enum nl80211_attrs { +@@ -156,21 +156,23 @@ + * @NL80211_CMD_DEL_KEY: delete a key identified by %NL80211_ATTR_KEY_IDX + * or %NL80211_ATTR_MAC. + * +- * @NL80211_CMD_GET_BEACON: retrieve beacon information (returned in a +- * %NL80222_CMD_NEW_BEACON message) +- * @NL80211_CMD_SET_BEACON: set the beacon on an access point interface +- * using the %NL80211_ATTR_BEACON_INTERVAL, %NL80211_ATTR_DTIM_PERIOD, +- * %NL80211_ATTR_BEACON_HEAD and %NL80211_ATTR_BEACON_TAIL attributes. +- * Following attributes are provided for drivers that generate full Beacon +- * and Probe Response frames internally: %NL80211_ATTR_SSID, ++ * @NL80211_CMD_GET_BEACON: (not used) ++ * @NL80211_CMD_SET_BEACON: change the beacon on an access point interface ++ * using the %NL80211_ATTR_BEACON_HEAD and %NL80211_ATTR_BEACON_TAIL ++ * attributes. For drivers that generate the beacon and probe responses ++ * internally, the following attributes must be provided: %NL80211_ATTR_IE, ++ * %NL80211_ATTR_IE_PROBE_RESP and %NL80211_ATTR_IE_ASSOC_RESP. ++ * @NL80211_CMD_START_AP: Start AP operation on an AP interface, parameters ++ * are like for %NL80211_CMD_SET_BEACON, and additionally parameters that ++ * do not change are used, these include %NL80211_ATTR_BEACON_INTERVAL, ++ * %NL80211_ATTR_DTIM_PERIOD, %NL80211_ATTR_SSID, + * %NL80211_ATTR_HIDDEN_SSID, %NL80211_ATTR_CIPHERS_PAIRWISE, + * %NL80211_ATTR_CIPHER_GROUP, %NL80211_ATTR_WPA_VERSIONS, + * %NL80211_ATTR_AKM_SUITES, %NL80211_ATTR_PRIVACY, +- * %NL80211_ATTR_AUTH_TYPE, %NL80211_ATTR_IE, %NL80211_ATTR_IE_PROBE_RESP, +- * %NL80211_ATTR_IE_ASSOC_RESP. +- * @NL80211_CMD_NEW_BEACON: add a new beacon to an access point interface, +- * parameters are like for %NL80211_CMD_SET_BEACON. +- * @NL80211_CMD_DEL_BEACON: remove the beacon, stop sending it ++ * %NL80211_ATTR_AUTH_TYPE and %NL80211_ATTR_INACTIVITY_TIMEOUT. ++ * @NL80211_CMD_NEW_BEACON: old alias for %NL80211_CMD_START_AP ++ * @NL80211_CMD_STOP_AP: Stop AP operation on the given interface ++ * @NL80211_CMD_DEL_BEACON: old alias for %NL80211_CMD_STOP_AP + * + * @NL80211_CMD_GET_STATION: Get station attributes for station identified by + * %NL80211_ATTR_MAC on the interface identified by %NL80211_ATTR_IFINDEX. +@@ -367,6 +369,11 @@ + * %NL80211_ATTR_WIPHY_FREQ, %NL80211_ATTR_CONTROL_PORT, + * %NL80211_ATTR_CONTROL_PORT_ETHERTYPE and + * %NL80211_ATTR_CONTROL_PORT_NO_ENCRYPT. ++ * Background scan period can optionally be ++ * specified in %NL80211_ATTR_BG_SCAN_PERIOD, ++ * if not specified default background scan configuration ++ * in driver is used and if period value is 0, bg scan will be disabled. ++ * This attribute is ignored if driver does not support roam scan. + * It is also sent as an event, with the BSSID and response IEs when the + * connection is established or failed to be established. This can be + * determined by the STATUS_CODE attribute. +@@ -541,6 +548,11 @@ + * @NL80211_CMD_SET_NOACK_MAP: sets a bitmap for the individual TIDs whether + * No Acknowledgement Policy should be applied. + * ++ * @NL80211_CMD_CH_SWITCH_NOTIFY: An AP or GO may decide to switch channels ++ * independently of the userspace SME, send this event indicating ++ * %NL80211_ATTR_IFINDEX is now on %NL80211_ATTR_WIPHY_FREQ with ++ * %NL80211_ATTR_WIPHY_CHANNEL_TYPE. ++ * + * @NL80211_CMD_MAX: highest used command number + * @__NL80211_CMD_AFTER_LAST: internal use + */ +@@ -565,8 +577,10 @@ enum nl80211_commands { + + NL80211_CMD_GET_BEACON, + NL80211_CMD_SET_BEACON, +- NL80211_CMD_NEW_BEACON, +- NL80211_CMD_DEL_BEACON, ++ NL80211_CMD_START_AP, ++ NL80211_CMD_NEW_BEACON = NL80211_CMD_START_AP, ++ NL80211_CMD_STOP_AP, ++ NL80211_CMD_DEL_BEACON = NL80211_CMD_STOP_AP, + + NL80211_CMD_GET_STATION, + NL80211_CMD_SET_STATION, +@@ -680,6 +694,8 @@ enum nl80211_commands { + + NL80211_CMD_SET_NOACK_MAP, + ++ NL80211_CMD_CH_SWITCH_NOTIFY, ++ + /* add new commands above here */ + + /* used to define NL80211_CMD_MAX below */ +@@ -1193,6 +1209,19 @@ enum nl80211_commands { + * @NL80211_ATTR_NOACK_MAP: This u16 bitmap contains the No Ack Policy of + * up to 16 TIDs. + * ++ * @NL80211_ATTR_INACTIVITY_TIMEOUT: timeout value in seconds, this can be ++ * used by the drivers which has MLME in firmware and does not have support ++ * to report per station tx/rx activity to free up the staion entry from ++ * the list. This needs to be used when the driver advertises the ++ * capability to timeout the stations. ++ * ++ * @NL80211_ATTR_RX_SIGNAL_DBM: signal strength in dBm (as a 32-bit int); ++ * this attribute is (depending on the driver capabilities) added to ++ * received frames indicated with %NL80211_CMD_FRAME. ++ * ++ * @NL80211_ATTR_BG_SCAN_PERIOD: Background scan period in seconds ++ * or 0 to disable background scan. ++ * + * @NL80211_ATTR_MAX: highest attribute number currently defined + * @__NL80211_ATTR_AFTER_LAST: internal use + */ +@@ -1438,6 +1467,12 @@ enum nl80211_attrs { + + NL80211_ATTR_NOACK_MAP, + ++ NL80211_ATTR_INACTIVITY_TIMEOUT, ++ ++ NL80211_ATTR_RX_SIGNAL_DBM, ++ ++ NL80211_ATTR_BG_SCAN_PERIOD, ++ + /* add attributes here, update the policy in nl80211.c */ + + __NL80211_ATTR_AFTER_LAST, +@@ -1475,6 +1510,7 @@ enum nl80211_attrs { #define NL80211_ATTR_FEATURE_FLAGS NL80211_ATTR_FEATURE_FLAGS #define NL80211_MAX_SUPP_RATES 32 @@ -8,7 +123,7 @@ #define NL80211_MAX_SUPP_REG_RULES 32 #define NL80211_TKIP_DATA_OFFSET_ENCR_KEY 0 #define NL80211_TKIP_DATA_OFFSET_TX_MIC_KEY 16 -@@ -1536,7 +1537,11 @@ enum nl80211_iftype { +@@ -1536,7 +1572,11 @@ enum nl80211_iftype { * @NL80211_STA_FLAG_WME: station is WME/QoS capable * @NL80211_STA_FLAG_MFP: station uses management frame protection * @NL80211_STA_FLAG_AUTHENTICATED: station is authenticated @@ -21,45 +136,123 @@ * @NL80211_STA_FLAG_MAX: highest station flag number currently defined * @__NL80211_STA_FLAG_AFTER_LAST: internal use */ -@@ -1651,6 +1656,9 @@ enum nl80211_sta_bss_param { +@@ -1651,6 +1691,10 @@ enum nl80211_sta_bss_param { * containing info as possible, see &enum nl80211_sta_bss_param * @NL80211_STA_INFO_CONNECTED_TIME: time since the station is last connected * @NL80211_STA_INFO_STA_FLAGS: Contains a struct nl80211_sta_flag_update. + * @NL80211_STA_INFO_BEACON_LOSS: count of times beacon loss was detected (u32) ++ * @NL80211_STA_INFO_T_OFFSET: timing offset with respect to this STA (s64) + * @NL80211_STA_INFO_CHAIN_SIGNAL: per-chain signal strength of last PPDU + * @NL80211_STA_INFO_CHAIN_SIGNAL_AVG: per-chain signal strength average * @__NL80211_STA_INFO_AFTER_LAST: internal * @NL80211_STA_INFO_MAX: highest possible station info attribute */ -@@ -1673,6 +1681,9 @@ enum nl80211_sta_info { +@@ -1673,6 +1717,10 @@ enum nl80211_sta_info { NL80211_STA_INFO_BSS_PARAM, NL80211_STA_INFO_CONNECTED_TIME, NL80211_STA_INFO_STA_FLAGS, + NL80211_STA_INFO_BEACON_LOSS, ++ NL80211_STA_INFO_T_OFFSET, + NL80211_STA_INFO_CHAIN_SIGNAL, + NL80211_STA_INFO_CHAIN_SIGNAL_AVG, /* keep last */ __NL80211_STA_INFO_AFTER_LAST, -@@ -2098,6 +2109,9 @@ enum nl80211_mntr_flags { +@@ -2098,8 +2146,18 @@ enum nl80211_mntr_flags { * TUs) during which a mesh STA can send only one Action frame containing a * PERR element. * + * @NL80211_MESHCONF_FORWARDING: set Mesh STA as forwarding or non-forwarding + * or forwarding entity (default is TRUE - forwarding entity) ++ * ++ * @NL80211_MESHCONF_RSSI_THRESHOLD: RSSI threshold in dBm. This specifies the ++ * threshold for average signal strength of candidate station to establish ++ * a peer link. + * * @NL80211_MESHCONF_ATTR_MAX: highest possible mesh configuration attribute * ++ * @NL80211_MESHCONF_SYNC_OFFSET_MAX_NEIGHBOR: maximum number of neighbors ++ * to synchronize to for 11s default synchronization method (see 11C.12.2.2) ++ * * @__NL80211_MESHCONF_ATTR_AFTER_LAST: internal use -@@ -2122,6 +2136,7 @@ enum nl80211_meshconf_params { + */ + enum nl80211_meshconf_params { +@@ -2122,6 +2180,9 @@ enum nl80211_meshconf_params { NL80211_MESHCONF_HWMP_RANN_INTERVAL, NL80211_MESHCONF_GATE_ANNOUNCEMENTS, NL80211_MESHCONF_HWMP_PERR_MIN_INTERVAL, + NL80211_MESHCONF_FORWARDING, ++ NL80211_MESHCONF_RSSI_THRESHOLD, ++ NL80211_MESHCONF_SYNC_OFFSET_MAX_NEIGHBOR, /* keep last */ __NL80211_MESHCONF_ATTR_AFTER_LAST, -@@ -2395,12 +2410,15 @@ enum nl80211_key_attributes { +@@ -2161,6 +2222,11 @@ enum nl80211_meshconf_params { + * complete (unsecured) mesh peering without the need of a userspace daemon. + * + * @NL80211_MESH_SETUP_ATTR_MAX: highest possible mesh setup attribute number ++ * ++ * @NL80211_MESH_SETUP_ENABLE_VENDOR_SYNC: Enable this option to use a ++ * vendor specific synchronization method or disable it to use the default ++ * neighbor offset synchronization ++ * + * @__NL80211_MESH_SETUP_ATTR_AFTER_LAST: Internal use + */ + enum nl80211_mesh_setup_params { +@@ -2170,6 +2236,7 @@ enum nl80211_mesh_setup_params { + NL80211_MESH_SETUP_IE, + NL80211_MESH_SETUP_USERSPACE_AUTH, + NL80211_MESH_SETUP_USERSPACE_AMPE, ++ NL80211_MESH_SETUP_ENABLE_VENDOR_SYNC, + + /* keep last */ + __NL80211_MESH_SETUP_ATTR_AFTER_LAST, +@@ -2179,7 +2246,7 @@ enum nl80211_mesh_setup_params { + /** + * enum nl80211_txq_attr - TX queue parameter attributes + * @__NL80211_TXQ_ATTR_INVALID: Attribute number 0 is reserved +- * @NL80211_TXQ_ATTR_QUEUE: TX queue identifier (NL80211_TXQ_Q_*) ++ * @NL80211_TXQ_ATTR_AC: AC identifier (NL80211_AC_*) + * @NL80211_TXQ_ATTR_TXOP: Maximum burst time in units of 32 usecs, 0 meaning + * disabled + * @NL80211_TXQ_ATTR_CWMIN: Minimum contention window [a value of the form +@@ -2192,7 +2259,7 @@ enum nl80211_mesh_setup_params { + */ + enum nl80211_txq_attr { + __NL80211_TXQ_ATTR_INVALID, +- NL80211_TXQ_ATTR_QUEUE, ++ NL80211_TXQ_ATTR_AC, + NL80211_TXQ_ATTR_TXOP, + NL80211_TXQ_ATTR_CWMIN, + NL80211_TXQ_ATTR_CWMAX, +@@ -2203,13 +2270,21 @@ enum nl80211_txq_attr { + NL80211_TXQ_ATTR_MAX = __NL80211_TXQ_ATTR_AFTER_LAST - 1 + }; + +-enum nl80211_txq_q { +- NL80211_TXQ_Q_VO, +- NL80211_TXQ_Q_VI, +- NL80211_TXQ_Q_BE, +- NL80211_TXQ_Q_BK ++enum nl80211_ac { ++ NL80211_AC_VO, ++ NL80211_AC_VI, ++ NL80211_AC_BE, ++ NL80211_AC_BK, ++ NL80211_NUM_ACS + }; + ++/* backward compat */ ++#define NL80211_TXQ_ATTR_QUEUE NL80211_TXQ_ATTR_AC ++#define NL80211_TXQ_Q_VO NL80211_AC_VO ++#define NL80211_TXQ_Q_VI NL80211_AC_VI ++#define NL80211_TXQ_Q_BE NL80211_AC_BE ++#define NL80211_TXQ_Q_BK NL80211_AC_BK ++ + enum nl80211_channel_type { + NL80211_CHAN_NO_HT, + NL80211_CHAN_HT20, +@@ -2395,12 +2470,15 @@ enum nl80211_key_attributes { * in an array of rates as defined in IEEE 802.11 7.3.2.2 (u8 values with * 1 = 500 kbps) but without the IE length restriction (at most * %NL80211_MAX_SUPP_RATES in a single array). @@ -75,3 +268,17 @@ /* keep last */ __NL80211_TXRATE_AFTER_LAST, +@@ -2786,10 +2864,13 @@ enum nl80211_ap_sme_features { + * TX status to the socket error queue when requested with the + * socket option. + * @NL80211_FEATURE_HT_IBSS: This driver supports IBSS with HT datarates. ++ * @NL80211_FEATURE_INACTIVITY_TIMER: This driver takes care of freeing up ++ * the connected inactive stations in AP mode. + */ + enum nl80211_feature_flags { + NL80211_FEATURE_SK_TX_STATUS = 1 << 0, + NL80211_FEATURE_HT_IBSS = 1 << 1, ++ NL80211_FEATURE_INACTIVITY_TIMER = 1 << 2, + }; + + /** -- 2.30.2