diff options
Diffstat (limited to 'package/network/utils/iw')
| -rw-r--r-- | package/network/utils/iw/patches/001-nl80211_h_sync.patch | 342 |
1 files changed, 331 insertions, 11 deletions
diff --git a/package/network/utils/iw/patches/001-nl80211_h_sync.patch b/package/network/utils/iw/patches/001-nl80211_h_sync.patch index 8e776643b7..fc28a652d5 100644 --- a/package/network/utils/iw/patches/001-nl80211_h_sync.patch +++ b/package/network/utils/iw/patches/001-nl80211_h_sync.patch @@ -1,9 +1,87 @@ --- a/nl80211.h +++ b/nl80211.h -@@ -565,6 +565,14 @@ - * %NL80211_ATTR_IFINDEX is now on %NL80211_ATTR_WIPHY_FREQ with - * %NL80211_ATTR_WIPHY_CHANNEL_TYPE. +@@ -118,8 +118,9 @@ + * to get a list of all present wiphys. + * @NL80211_CMD_SET_WIPHY: set wiphy parameters, needs %NL80211_ATTR_WIPHY or + * %NL80211_ATTR_IFINDEX; can be used to set %NL80211_ATTR_WIPHY_NAME, +- * %NL80211_ATTR_WIPHY_TXQ_PARAMS, %NL80211_ATTR_WIPHY_FREQ, +- * %NL80211_ATTR_WIPHY_CHANNEL_TYPE, %NL80211_ATTR_WIPHY_RETRY_SHORT, ++ * %NL80211_ATTR_WIPHY_TXQ_PARAMS, %NL80211_ATTR_WIPHY_FREQ (and the ++ * attributes determining the channel width; this is used for setting ++ * monitor mode channel), %NL80211_ATTR_WIPHY_RETRY_SHORT, + * %NL80211_ATTR_WIPHY_RETRY_LONG, %NL80211_ATTR_WIPHY_FRAG_THRESHOLD, + * and/or %NL80211_ATTR_WIPHY_RTS_THRESHOLD. + * However, for setting the channel, see %NL80211_CMD_SET_CHANNEL +@@ -171,7 +172,7 @@ + * %NL80211_ATTR_AKM_SUITES, %NL80211_ATTR_PRIVACY, + * %NL80211_ATTR_AUTH_TYPE and %NL80211_ATTR_INACTIVITY_TIMEOUT. + * The channel to use can be set on the interface or be given using the +- * %NL80211_ATTR_WIPHY_FREQ and %NL80211_ATTR_WIPHY_CHANNEL_TYPE attrs. ++ * %NL80211_ATTR_WIPHY_FREQ and the attributes determining channel width. + * @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 +@@ -401,8 +402,7 @@ + * a response while being associated to an AP on another channel. + * %NL80211_ATTR_IFINDEX is used to specify which interface (and thus + * radio) is used. %NL80211_ATTR_WIPHY_FREQ is used to specify the +- * frequency for the operation and %NL80211_ATTR_WIPHY_CHANNEL_TYPE may be +- * optionally used to specify additional channel parameters. ++ * frequency for the operation. + * %NL80211_ATTR_DURATION is used to specify the duration in milliseconds + * to remain on the channel. This command is also used as an event to + * notify when the requested duration starts (it may take a while for the +@@ -440,12 +440,11 @@ + * as an event indicating reception of a frame that was not processed in + * kernel code, but is for us (i.e., which may need to be processed in a + * user space application). %NL80211_ATTR_FRAME is used to specify the +- * frame contents (including header). %NL80211_ATTR_WIPHY_FREQ (and +- * optionally %NL80211_ATTR_WIPHY_CHANNEL_TYPE) is used to indicate on +- * which channel the frame is to be transmitted or was received. If this +- * channel is not the current channel (remain-on-channel or the +- * operational channel) the device will switch to the given channel and +- * transmit the frame, optionally waiting for a response for the time ++ * frame contents (including header). %NL80211_ATTR_WIPHY_FREQ is used ++ * to indicate on which channel the frame is to be transmitted or was ++ * received. If this channel is not the current channel (remain-on-channel ++ * or the operational channel) the device will switch to the given channel ++ * and transmit the frame, optionally waiting for a response for the time + * specified using %NL80211_ATTR_DURATION. When called, this operation + * returns a cookie (%NL80211_ATTR_COOKIE) that will be included with the + * TX status event pertaining to the TX request. +@@ -473,8 +472,8 @@ + * command is used as an event to indicate the that a trigger level was + * reached. + * @NL80211_CMD_SET_CHANNEL: Set the channel (using %NL80211_ATTR_WIPHY_FREQ +- * and %NL80211_ATTR_WIPHY_CHANNEL_TYPE) the given interface (identifed +- * by %NL80211_ATTR_IFINDEX) shall operate on. ++ * and the attributes determining channel width) the given interface ++ * (identifed by %NL80211_ATTR_IFINDEX) shall operate on. + * In case multiple channels are supported by the device, the mechanism + * with which it switches channels is implementation-defined. + * When a monitor interface is given, it can only switch channel while +@@ -526,6 +525,12 @@ + * of PMKSA caching dandidates. * + * @NL80211_CMD_TDLS_OPER: Perform a high-level TDLS command (e.g. link setup). ++ * In addition, this can be used as an event to request userspace to take ++ * actions on TDLS links (set up a new link or tear down an existing one). ++ * In such events, %NL80211_ATTR_TDLS_OPERATION indicates the requested ++ * operation, %NL80211_ATTR_MAC contains the peer MAC address, and ++ * %NL80211_ATTR_REASON_CODE the reason code to be used (only with ++ * %NL80211_TDLS_TEARDOWN). + * @NL80211_CMD_TDLS_MGMT: Send a TDLS management frame. + * + * @NL80211_CMD_UNEXPECTED_FRAME: Used by an application controlling an AP +@@ -562,8 +567,24 @@ + * + * @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_ATTR_IFINDEX is now on %NL80211_ATTR_WIPHY_FREQ and the ++ * attributes determining channel width. ++ * + * @NL80211_CMD_START_P2P_DEVICE: Start the given P2P Device, identified by + * its %NL80211_ATTR_WDEV identifier. It must have been created with + * %NL80211_CMD_NEW_INTERFACE previously. After it has been started, the @@ -12,29 +90,118 @@ + * @NL80211_CMD_STOP_P2P_DEVICE: Stop the given P2P Device, identified by + * its %NL80211_ATTR_WDEV identifier. + * ++ * @NL80211_CMD_CONN_FAILED: connection request to an AP failed; used to ++ * notify userspace that AP has rejected the connection request from a ++ * station, due to particular reason. %NL80211_ATTR_CONN_FAILED_REASON ++ * is used for this. ++ * ++ * @NL80211_CMD_SET_MCAST_RATE: Change the rate used to send multicast frames ++ * for IBSS or MESH vif. + * * @NL80211_CMD_MAX: highest used command number * @__NL80211_CMD_AFTER_LAST: internal use - */ -@@ -708,6 +716,9 @@ enum nl80211_commands { +@@ -708,6 +729,13 @@ enum nl80211_commands { NL80211_CMD_CH_SWITCH_NOTIFY, + NL80211_CMD_START_P2P_DEVICE, + NL80211_CMD_STOP_P2P_DEVICE, + ++ NL80211_CMD_CONN_FAILED, ++ ++ NL80211_CMD_SET_MCAST_RATE, ++ /* add new commands above here */ /* used to define NL80211_CMD_MAX below */ -@@ -1506,6 +1517,8 @@ enum nl80211_attrs { +@@ -744,14 +772,26 @@ enum nl80211_commands { + * /sys/class/ieee80211/<phyname>/index + * @NL80211_ATTR_WIPHY_NAME: wiphy name (used for renaming) + * @NL80211_ATTR_WIPHY_TXQ_PARAMS: a nested array of TX queue parameters +- * @NL80211_ATTR_WIPHY_FREQ: frequency of the selected channel in MHz ++ * @NL80211_ATTR_WIPHY_FREQ: frequency of the selected channel in MHz, ++ * defines the channel together with the (deprecated) ++ * %NL80211_ATTR_WIPHY_CHANNEL_TYPE attribute or the attributes ++ * %NL80211_ATTR_CHANNEL_WIDTH and if needed %NL80211_ATTR_CENTER_FREQ1 ++ * and %NL80211_ATTR_CENTER_FREQ2 ++ * @NL80211_ATTR_CHANNEL_WIDTH: u32 attribute containing one of the values ++ * of &enum nl80211_chan_width, describing the channel width. See the ++ * documentation of the enum for more information. ++ * @NL80211_ATTR_CENTER_FREQ1: Center frequency of the first part of the ++ * channel, used for anything but 20 MHz bandwidth ++ * @NL80211_ATTR_CENTER_FREQ2: Center frequency of the second part of the ++ * channel, used only for 80+80 MHz bandwidth + * @NL80211_ATTR_WIPHY_CHANNEL_TYPE: included with NL80211_ATTR_WIPHY_FREQ +- * if HT20 or HT40 are allowed (i.e., 802.11n disabled if not included): ++ * if HT20 or HT40 are to be used (i.e., HT disabled if not included): + * NL80211_CHAN_NO_HT = HT not allowed (i.e., same as not including + * this attribute) + * NL80211_CHAN_HT20 = HT20 only + * NL80211_CHAN_HT40MINUS = secondary channel is below the primary channel + * NL80211_CHAN_HT40PLUS = secondary channel is above the primary channel ++ * This attribute is now deprecated. + * @NL80211_ATTR_WIPHY_RETRY_SHORT: TX retry limit for frames whose length is + * less than or equal to the RTS threshold; allowed range: 1..255; + * dot11ShortRetryLimit; u8 +@@ -1251,6 +1291,25 @@ enum nl80211_commands { + * was used to provide the hint. For the different types of + * allowed user regulatory hints see nl80211_user_reg_hint_type. + * ++ * @NL80211_ATTR_CONN_FAILED_REASON: The reason for which AP has rejected ++ * the connection request from a station. nl80211_connect_failed_reason ++ * enum has different reasons of connection failure. ++ * ++ * @NL80211_ATTR_SAE_DATA: SAE elements in Authentication frames. This starts ++ * with the Authentication transaction sequence number field. ++ * ++ * @NL80211_ATTR_VHT_CAPABILITY: VHT Capability information element (from ++ * association request when used with NL80211_CMD_NEW_STATION) ++ * ++ * @NL80211_ATTR_SCAN_FLAGS: scan request control flags (u32) ++ * ++ * @NL80211_ATTR_P2P_CTWINDOW: P2P GO Client Traffic Window (u8), used with ++ * the START_AP and SET_BSS commands ++ * @NL80211_ATTR_P2P_OPPPS: P2P GO opportunistic PS (u8), used with the ++ * START_AP and SET_BSS commands. This can have the values 0 or 1; ++ * if not given in START_AP 0 is assumed, if not given in SET_BSS ++ * no change is made. ++ * + * @NL80211_ATTR_MAX: highest attribute number currently defined + * @__NL80211_ATTR_AFTER_LAST: internal use + */ +@@ -1506,6 +1565,23 @@ enum nl80211_attrs { NL80211_ATTR_USER_REG_HINT_TYPE, ++ NL80211_ATTR_CONN_FAILED_REASON, ++ ++ NL80211_ATTR_SAE_DATA, ++ ++ NL80211_ATTR_VHT_CAPABILITY, ++ ++ NL80211_ATTR_SCAN_FLAGS, ++ ++ NL80211_ATTR_CHANNEL_WIDTH, ++ NL80211_ATTR_CENTER_FREQ1, ++ NL80211_ATTR_CENTER_FREQ2, ++ ++ NL80211_ATTR_P2P_CTWINDOW, ++ NL80211_ATTR_P2P_OPPPS, ++ + NL80211_ATTR_WIPHY_ANTENNA_GAIN, + /* add attributes here, update the policy in nl80211.c */ __NL80211_ATTR_AFTER_LAST, -@@ -1575,6 +1588,10 @@ enum nl80211_attrs { +@@ -1549,6 +1625,7 @@ enum nl80211_attrs { + #define NL80211_TKIP_DATA_OFFSET_TX_MIC_KEY 16 + #define NL80211_TKIP_DATA_OFFSET_RX_MIC_KEY 24 + #define NL80211_HT_CAPABILITY_LEN 26 ++#define NL80211_VHT_CAPABILITY_LEN 12 + + #define NL80211_MAX_NR_CIPHER_SUITES 5 + #define NL80211_MAX_NR_AKM_SUITES 2 +@@ -1575,6 +1652,10 @@ enum nl80211_attrs { * @NL80211_IFTYPE_MESH_POINT: mesh point * @NL80211_IFTYPE_P2P_CLIENT: P2P client * @NL80211_IFTYPE_P2P_GO: P2P group owner @@ -45,7 +212,7 @@ * @NL80211_IFTYPE_MAX: highest interface type number currently defined * @NUM_NL80211_IFTYPES: number of defined interface types * -@@ -1593,6 +1610,7 @@ enum nl80211_iftype { +@@ -1593,6 +1674,7 @@ enum nl80211_iftype { NL80211_IFTYPE_MESH_POINT, NL80211_IFTYPE_P2P_CLIENT, NL80211_IFTYPE_P2P_GO, @@ -53,7 +220,36 @@ /* keep last */ NUM_NL80211_IFTYPES, -@@ -1744,6 +1762,8 @@ enum nl80211_sta_bss_param { +@@ -1664,10 +1746,15 @@ struct nl80211_sta_flag_update { + * @__NL80211_RATE_INFO_INVALID: attribute number 0 is reserved + * @NL80211_RATE_INFO_BITRATE: total bitrate (u16, 100kbit/s) + * @NL80211_RATE_INFO_MCS: mcs index for 802.11n (u8) +- * @NL80211_RATE_INFO_40_MHZ_WIDTH: 40 Mhz dualchannel bitrate ++ * @NL80211_RATE_INFO_40_MHZ_WIDTH: 40 MHz dualchannel bitrate + * @NL80211_RATE_INFO_SHORT_GI: 400ns guard interval + * @NL80211_RATE_INFO_BITRATE32: total bitrate (u32, 100kbit/s) + * @NL80211_RATE_INFO_MAX: highest rate_info number currently defined ++ * @NL80211_RATE_INFO_VHT_MCS: MCS index for VHT (u8) ++ * @NL80211_RATE_INFO_VHT_NSS: number of streams in VHT (u8) ++ * @NL80211_RATE_INFO_80_MHZ_WIDTH: 80 MHz VHT rate ++ * @NL80211_RATE_INFO_80P80_MHZ_WIDTH: 80+80 MHz VHT rate ++ * @NL80211_RATE_INFO_160_MHZ_WIDTH: 160 MHz VHT rate + * @__NL80211_RATE_INFO_AFTER_LAST: internal use + */ + enum nl80211_rate_info { +@@ -1677,6 +1764,11 @@ enum nl80211_rate_info { + NL80211_RATE_INFO_40_MHZ_WIDTH, + NL80211_RATE_INFO_SHORT_GI, + NL80211_RATE_INFO_BITRATE32, ++ NL80211_RATE_INFO_VHT_MCS, ++ NL80211_RATE_INFO_VHT_NSS, ++ NL80211_RATE_INFO_80_MHZ_WIDTH, ++ NL80211_RATE_INFO_80P80_MHZ_WIDTH, ++ NL80211_RATE_INFO_160_MHZ_WIDTH, + + /* keep last */ + __NL80211_RATE_INFO_AFTER_LAST, +@@ -1744,6 +1836,8 @@ enum nl80211_sta_bss_param { * @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) @@ -62,7 +258,7 @@ * @__NL80211_STA_INFO_AFTER_LAST: internal * @NL80211_STA_INFO_MAX: highest possible station info attribute */ -@@ -1768,6 +1788,8 @@ enum nl80211_sta_info { +@@ -1768,6 +1862,8 @@ enum nl80211_sta_info { NL80211_STA_INFO_STA_FLAGS, NL80211_STA_INFO_BEACON_LOSS, NL80211_STA_INFO_T_OFFSET, @@ -71,7 +267,72 @@ /* keep last */ __NL80211_STA_INFO_AFTER_LAST, -@@ -2994,12 +3016,18 @@ enum nl80211_ap_sme_features { +@@ -2385,6 +2481,15 @@ enum nl80211_ac { + #define NL80211_TXQ_Q_BE NL80211_AC_BE + #define NL80211_TXQ_Q_BK NL80211_AC_BK + ++/** ++ * enum nl80211_channel_type - channel type ++ * @NL80211_CHAN_NO_HT: 20 MHz, non-HT channel ++ * @NL80211_CHAN_HT20: 20 MHz HT channel ++ * @NL80211_CHAN_HT40MINUS: HT40 channel, secondary channel ++ * below the control channel ++ * @NL80211_CHAN_HT40PLUS: HT40 channel, secondary channel ++ * above the control channel ++ */ + enum nl80211_channel_type { + NL80211_CHAN_NO_HT, + NL80211_CHAN_HT20, +@@ -2393,6 +2498,32 @@ enum nl80211_channel_type { + }; + + /** ++ * enum nl80211_chan_width - channel width definitions ++ * ++ * These values are used with the %NL80211_ATTR_CHANNEL_WIDTH ++ * attribute. ++ * ++ * @NL80211_CHAN_WIDTH_20_NOHT: 20 MHz, non-HT channel ++ * @NL80211_CHAN_WIDTH_20: 20 MHz HT channel ++ * @NL80211_CHAN_WIDTH_40: 40 MHz channel, the %NL80211_ATTR_CENTER_FREQ1 ++ * attribute must be provided as well ++ * @NL80211_CHAN_WIDTH_80: 80 MHz channel, the %NL80211_ATTR_CENTER_FREQ1 ++ * attribute must be provided as well ++ * @NL80211_CHAN_WIDTH_80P80: 80+80 MHz channel, the %NL80211_ATTR_CENTER_FREQ1 ++ * and %NL80211_ATTR_CENTER_FREQ2 attributes must be provided as well ++ * @NL80211_CHAN_WIDTH_160: 160 MHz channel, the %NL80211_ATTR_CENTER_FREQ1 ++ * attribute must be provided as well ++ */ ++enum nl80211_chan_width { ++ NL80211_CHAN_WIDTH_20_NOHT, ++ NL80211_CHAN_WIDTH_20, ++ NL80211_CHAN_WIDTH_40, ++ NL80211_CHAN_WIDTH_80, ++ NL80211_CHAN_WIDTH_80P80, ++ NL80211_CHAN_WIDTH_160, ++}; ++ ++/** + * enum nl80211_bss - netlink attributes for a BSS + * + * @__NL80211_BSS_INVALID: invalid +@@ -2460,6 +2591,7 @@ enum nl80211_bss_status { + * @NL80211_AUTHTYPE_SHARED_KEY: Shared Key authentication (WEP only) + * @NL80211_AUTHTYPE_FT: Fast BSS Transition (IEEE 802.11r) + * @NL80211_AUTHTYPE_NETWORK_EAP: Network EAP (some Cisco APs and mainly LEAP) ++ * @NL80211_AUTHTYPE_SAE: Simultaneous authentication of equals + * @__NL80211_AUTHTYPE_NUM: internal + * @NL80211_AUTHTYPE_MAX: maximum valid auth algorithm + * @NL80211_AUTHTYPE_AUTOMATIC: determine automatically (if necessary by +@@ -2471,6 +2603,7 @@ enum nl80211_auth_type { + NL80211_AUTHTYPE_SHARED_KEY, + NL80211_AUTHTYPE_FT, + NL80211_AUTHTYPE_NETWORK_EAP, ++ NL80211_AUTHTYPE_SAE, + + /* keep last */ + __NL80211_AUTHTYPE_NUM, +@@ -2994,12 +3127,40 @@ enum nl80211_ap_sme_features { * @NL80211_FEATURE_CELL_BASE_REG_HINTS: This driver has been tested * to work properly to suppport receiving regulatory hints from * cellular base stations. @@ -80,6 +341,20 @@ + * in the interface combinations, even when it's only used for scan + * and remain-on-channel. This could be due to, for example, the + * remain-on-channel implementation requiring a channel context. ++ * @NL80211_FEATURE_SAE: This driver supports simultaneous authentication of ++ * equals (SAE) with user space SME (NL80211_CMD_AUTHENTICATE) in station ++ * mode ++ * @NL80211_FEATURE_LOW_PRIORITY_SCAN: This driver supports low priority scan ++ * @NL80211_FEATURE_SCAN_FLUSH: Scan flush is supported ++ * @NL80211_FEATURE_AP_SCAN: Support scanning using an AP vif ++ * @NL80211_FEATURE_VIF_TXPOWER: The driver supports per-vif TX power setting ++ * @NL80211_FEATURE_NEED_OBSS_SCAN: The driver expects userspace to perform ++ * OBSS scans and generate 20/40 BSS coex reports. This flag is used only ++ * for drivers implementing the CONNECT API, for AUTH/ASSOC it is implied. ++ * @NL80211_FEATURE_P2P_GO_CTWIN: P2P GO implementation supports CT Window ++ * setting ++ * @NL80211_FEATURE_P2P_GO_OPPPS: P2P GO implementation supports opportunistic ++ * powersave */ enum nl80211_feature_flags { - NL80211_FEATURE_SK_TX_STATUS = 1 << 0, @@ -91,6 +366,51 @@ + NL80211_FEATURE_INACTIVITY_TIMER = 1 << 2, + NL80211_FEATURE_CELL_BASE_REG_HINTS = 1 << 3, + NL80211_FEATURE_P2P_DEVICE_NEEDS_CHANNEL = 1 << 4, ++ NL80211_FEATURE_SAE = 1 << 5, ++ NL80211_FEATURE_LOW_PRIORITY_SCAN = 1 << 6, ++ NL80211_FEATURE_SCAN_FLUSH = 1 << 7, ++ NL80211_FEATURE_AP_SCAN = 1 << 8, ++ NL80211_FEATURE_VIF_TXPOWER = 1 << 9, ++ NL80211_FEATURE_NEED_OBSS_SCAN = 1 << 10, ++ NL80211_FEATURE_P2P_GO_CTWIN = 1 << 11, ++ NL80211_FEATURE_P2P_GO_OPPPS = 1 << 12, }; /** +@@ -3023,4 +3184,36 @@ enum nl80211_probe_resp_offload_support_ + NL80211_PROBE_RESP_OFFLOAD_SUPPORT_80211U = 1<<3, + }; + ++/** ++ * enum nl80211_connect_failed_reason - connection request failed reasons ++ * @NL80211_CONN_FAIL_MAX_CLIENTS: Maximum number of clients that can be ++ * handled by the AP is reached. ++ * @NL80211_CONN_FAIL_BLOCKED_CLIENT: Client's MAC is in the AP's blocklist. ++ */ ++enum nl80211_connect_failed_reason { ++ NL80211_CONN_FAIL_MAX_CLIENTS, ++ NL80211_CONN_FAIL_BLOCKED_CLIENT, ++}; ++ ++/** ++ * enum nl80211_scan_flags - scan request control flags ++ * ++ * Scan request control flags are used to control the handling ++ * of NL80211_CMD_TRIGGER_SCAN and NL80211_CMD_START_SCHED_SCAN ++ * requests. ++ * ++ * @NL80211_SCAN_FLAG_LOW_PRIORITY: scan request has low priority ++ * @NL80211_SCAN_FLAG_FLUSH: flush cache before scanning ++ * @NL80211_SCAN_FLAG_AP: force a scan even if the interface is configured ++ * as AP and the beaconing has already been configured. This attribute is ++ * dangerous because will destroy stations performance as a lot of frames ++ * will be lost while scanning off-channel, therefore it must be used only ++ * when really needed ++ */ ++enum nl80211_scan_flags { ++ NL80211_SCAN_FLAG_LOW_PRIORITY = 1<<0, ++ NL80211_SCAN_FLAG_FLUSH = 1<<1, ++ NL80211_SCAN_FLAG_AP = 1<<2, ++}; ++ + #endif /* __LINUX_NL80211_H */ |