From: Deng Qingfang Date: Sat, 9 Feb 2019 06:18:41 +0000 (+0800) Subject: iw: update to 5.0.1 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=f5db5742e4c6008b5bdb4e788cb4b44c6e420f43;p=openwrt%2Fstaging%2Fthess.git iw: update to 5.0.1 Refresh patches MIPS IPK size increases: iw-tiny: +3k iw-full: +10k Signed-off-by: Deng Qingfang [Remove sha256, nan, bloom, measurements and ftm from tiny version] [sync nl80211 between backports and iw] Signed-off-by: Hauke Mehrtens --- diff --git a/package/kernel/mac80211/patches/subsys/522-mac80211_configure_antenna_gain.patch b/package/kernel/mac80211/patches/subsys/522-mac80211_configure_antenna_gain.patch index 86bd2905ae..fe193cb4fd 100644 --- a/package/kernel/mac80211/patches/subsys/522-mac80211_configure_antenna_gain.patch +++ b/package/kernel/mac80211/patches/subsys/522-mac80211_configure_antenna_gain.patch @@ -36,20 +36,45 @@ u8 ps_dtim_period; --- a/include/uapi/linux/nl80211.h +++ b/include/uapi/linux/nl80211.h -@@ -2241,6 +2241,9 @@ enum nl80211_commands { +@@ -2241,6 +2241,26 @@ enum nl80211_commands { * association request when used with NL80211_CMD_NEW_STATION). Can be set * only if %NL80211_STA_FLAG_WME is set. * ++ * @NL80211_ATTR_FTM_RESPONDER: nested attribute which user-space can include ++ * in %NL80211_CMD_START_AP or %NL80211_CMD_SET_BEACON for fine timing ++ * measurement (FTM) responder functionality and containing parameters as ++ * possible, see &enum nl80211_ftm_responder_attr ++ * ++ * @NL80211_ATTR_FTM_RESPONDER_STATS: Nested attribute with FTM responder ++ * statistics, see &enum nl80211_ftm_responder_stats. ++ * ++ * @NL80211_ATTR_TIMEOUT: Timeout for the given operation in milliseconds (u32), ++ * if the attribute is not given no timeout is requested. Note that 0 is an ++ * invalid value. ++ * ++ * @NL80211_ATTR_PEER_MEASUREMENTS: peer measurements request (and result) ++ * data, uses nested attributes specified in ++ * &enum nl80211_peer_measurement_attrs. ++ * This is also used for capability advertisement in the wiphy information, ++ * with the appropriate sub-attributes. + * @NL80211_ATTR_WIPHY_ANTENNA_GAIN: Configured antenna gain. Used to reduce + * transmit power to stay within regulatory limits. u32, dBi. + * * @NUM_NL80211_ATTR: total number of nl80211_attrs available * @NL80211_ATTR_MAX: highest attribute number currently defined * @__NL80211_ATTR_AFTER_LAST: internal use -@@ -2682,6 +2685,8 @@ enum nl80211_attrs { +@@ -2682,6 +2702,16 @@ enum nl80211_attrs { NL80211_ATTR_HE_CAPABILITY, ++ NL80211_ATTR_FTM_RESPONDER, ++ ++ NL80211_ATTR_FTM_RESPONDER_STATS, ++ ++ NL80211_ATTR_TIMEOUT, ++ ++ NL80211_ATTR_PEER_MEASUREMENTS, ++ + NL80211_ATTR_WIPHY_ANTENNA_GAIN, + /* add attributes here, update the policy in nl80211.c */ diff --git a/package/network/utils/iw/Makefile b/package/network/utils/iw/Makefile index ef39ee6724..4b1542e967 100644 --- a/package/network/utils/iw/Makefile +++ b/package/network/utils/iw/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=iw -PKG_VERSION:=4.14 +PKG_VERSION:=5.0.1 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@KERNEL/software/network/iw -PKG_HASH:=f01671c0074bfdec082a884057edba1b9efd35c89eda554638496f03b769ad89 +PKG_HASH:=1e38ea794a223525b2ea7fe78fd14f2a56121e62e21ba5f9dbe8c494b35b5c0d PKG_BUILD_DIR:=$(BUILD_DIR)/iw-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) PKG_MAINTAINER:=Felix Fietkau 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 4fd37579a9..e1d318f529 100644 --- a/package/network/utils/iw/patches/001-nl80211_h_sync.patch +++ b/package/network/utils/iw/patches/001-nl80211_h_sync.patch @@ -1,629 +1,21 @@ -diff --git a/nl80211.h b/nl80211.h -index c587a61..255a971 100644 --- a/nl80211.h +++ b/nl80211.h -@@ -11,6 +11,7 @@ - * Copyright 2008 Jouni Malinen - * Copyright 2008 Colin McCabe - * Copyright 2015-2017 Intel Deutschland GmbH -+ * Copyright (C) 2018 Intel Corporation +@@ -2299,6 +2299,9 @@ enum nl80211_commands { + * This is also used for capability advertisement in the wiphy information, + * with the appropriate sub-attributes. * - * Permission to use, copy, modify, and/or distribute this software for any - * purpose with or without fee is hereby granted, provided that the above -@@ -203,7 +204,8 @@ - * FILS shared key authentication offload should be able to construct the - * authentication and association frames for FILS shared key authentication and - * eventually do a key derivation as per IEEE 802.11ai. The below additional -- * parameters should be given to driver in %NL80211_CMD_CONNECT. -+ * parameters should be given to driver in %NL80211_CMD_CONNECT and/or in -+ * %NL80211_CMD_UPDATE_CONNECT_PARAMS. - * %NL80211_ATTR_FILS_ERP_USERNAME - used to construct keyname_nai - * %NL80211_ATTR_FILS_ERP_REALM - used to construct keyname_nai - * %NL80211_ATTR_FILS_ERP_NEXT_SEQ_NUM - used to construct erp message -@@ -214,7 +216,8 @@ - * as specified in IETF RFC 6696. - * - * When FILS shared key authentication is completed, driver needs to provide the -- * below additional parameters to userspace. -+ * below additional parameters to userspace, which can be either after setting -+ * up a connection or after roaming. - * %NL80211_ATTR_FILS_KEK - used for key renewal - * %NL80211_ATTR_FILS_ERP_NEXT_SEQ_NUM - used in further EAP-RP exchanges - * %NL80211_ATTR_PMKID - used to identify the PMKSA used/generated -@@ -542,7 +545,8 @@ - * IEs in %NL80211_ATTR_IE, %NL80211_ATTR_AUTH_TYPE, %NL80211_ATTR_USE_MFP, - * %NL80211_ATTR_MAC, %NL80211_ATTR_WIPHY_FREQ, %NL80211_ATTR_CONTROL_PORT, - * %NL80211_ATTR_CONTROL_PORT_ETHERTYPE, -- * %NL80211_ATTR_CONTROL_PORT_NO_ENCRYPT, %NL80211_ATTR_MAC_HINT, and -+ * %NL80211_ATTR_CONTROL_PORT_NO_ENCRYPT, -+ * %NL80211_ATTR_CONTROL_PORT_OVER_NL80211, %NL80211_ATTR_MAC_HINT, and - * %NL80211_ATTR_WIPHY_FREQ_HINT. - * If included, %NL80211_ATTR_MAC and %NL80211_ATTR_WIPHY_FREQ are - * restrictions on BSS selection, i.e., they effectively prevent roaming -@@ -977,21 +981,58 @@ - * only the %NL80211_ATTR_IE data is used and updated with this command. - * - * @NL80211_CMD_SET_PMK: For offloaded 4-Way handshake, set the PMK or PMK-R0 -- * for the given authenticator address (specified with &NL80211_ATTR_MAC). -- * When &NL80211_ATTR_PMKR0_NAME is set, &NL80211_ATTR_PMK specifies the -+ * for the given authenticator address (specified with %NL80211_ATTR_MAC). -+ * When %NL80211_ATTR_PMKR0_NAME is set, %NL80211_ATTR_PMK specifies the - * PMK-R0, otherwise it specifies the PMK. - * @NL80211_CMD_DEL_PMK: For offloaded 4-Way handshake, delete the previously - * configured PMK for the authenticator address identified by -- * &NL80211_ATTR_MAC. -+ * %NL80211_ATTR_MAC. - * @NL80211_CMD_PORT_AUTHORIZED: An event that indicates that the 4 way - * handshake was completed successfully by the driver. The BSSID is -- * specified with &NL80211_ATTR_MAC. Drivers that support 4 way handshake -+ * specified with %NL80211_ATTR_MAC. Drivers that support 4 way handshake - * offload should send this event after indicating 802.11 association with -- * &NL80211_CMD_CONNECT or &NL80211_CMD_ROAM. If the 4 way handshake failed -- * &NL80211_CMD_DISCONNECT should be indicated instead. -+ * %NL80211_CMD_CONNECT or %NL80211_CMD_ROAM. If the 4 way handshake failed -+ * %NL80211_CMD_DISCONNECT should be indicated instead. -+ * -+ * @NL80211_CMD_CONTROL_PORT_FRAME: Control Port (e.g. PAE) frame TX request -+ * and RX notification. This command is used both as a request to transmit -+ * a control port frame and as a notification that a control port frame -+ * has been received. %NL80211_ATTR_FRAME is used to specify the -+ * frame contents. The frame is the raw EAPoL data, without ethernet or -+ * 802.11 headers. -+ * When used as an event indication %NL80211_ATTR_CONTROL_PORT_ETHERTYPE, -+ * %NL80211_ATTR_CONTROL_PORT_NO_ENCRYPT and %NL80211_ATTR_MAC are added -+ * indicating the protocol type of the received frame; whether the frame -+ * was received unencrypted and the MAC address of the peer respectively. - * - * @NL80211_CMD_RELOAD_REGDB: Request that the regdb firmware file is reloaded. - * -+ * @NL80211_CMD_EXTERNAL_AUTH: This interface is exclusively defined for host -+ * drivers that do not define separate commands for authentication and -+ * association, but rely on user space for the authentication to happen. -+ * This interface acts both as the event request (driver to user space) -+ * to trigger the authentication and command response (userspace to -+ * driver) to indicate the authentication status. -+ * -+ * User space uses the %NL80211_CMD_CONNECT command to the host driver to -+ * trigger a connection. The host driver selects a BSS and further uses -+ * this interface to offload only the authentication part to the user -+ * space. Authentication frames are passed between the driver and user -+ * space through the %NL80211_CMD_FRAME interface. Host driver proceeds -+ * further with the association after getting successful authentication -+ * status. User space indicates the authentication status through -+ * %NL80211_ATTR_STATUS_CODE attribute in %NL80211_CMD_EXTERNAL_AUTH -+ * command interface. -+ * -+ * Host driver reports this status on an authentication failure to the -+ * user space through the connect result as the user space would have -+ * initiated the connection through the connect request. -+ * -+ * @NL80211_CMD_STA_OPMODE_CHANGED: An event that notify station's -+ * ht opmode or vht opmode changes using any of %NL80211_ATTR_SMPS_MODE, -+ * %NL80211_ATTR_CHANNEL_WIDTH,%NL80211_ATTR_NSS attributes with its -+ * address(specified in %NL80211_ATTR_MAC). -+ * - * @NL80211_CMD_MAX: highest used command number - * @__NL80211_CMD_AFTER_LAST: internal use - */ -@@ -1198,6 +1239,12 @@ enum nl80211_commands { - - NL80211_CMD_RELOAD_REGDB, - -+ NL80211_CMD_EXTERNAL_AUTH, -+ -+ NL80211_CMD_STA_OPMODE_CHANGED, -+ -+ NL80211_CMD_CONTROL_PORT_FRAME, -+ - /* add new commands above here */ - - /* used to define NL80211_CMD_MAX below */ -@@ -1445,6 +1492,15 @@ enum nl80211_commands { - * @NL80211_ATTR_CONTROL_PORT_NO_ENCRYPT: When included along with - * %NL80211_ATTR_CONTROL_PORT_ETHERTYPE, indicates that the custom - * ethertype frames used for key negotiation must not be encrypted. -+ * @NL80211_ATTR_CONTROL_PORT_OVER_NL80211: A flag indicating whether control -+ * port frames (e.g. of type given in %NL80211_ATTR_CONTROL_PORT_ETHERTYPE) -+ * will be sent directly to the network interface or sent via the NL80211 -+ * socket. If this attribute is missing, then legacy behavior of sending -+ * control port frames directly to the network interface is used. If the -+ * flag is included, then control port frames are sent over NL80211 instead -+ * using %CMD_CONTROL_PORT_FRAME. If control port routing over NL80211 is -+ * to be used then userspace must also use the %NL80211_ATTR_SOCKET_OWNER -+ * flag. - * - * @NL80211_ATTR_TESTDATA: Testmode data blob, passed through to the driver. - * We recommend using nested, driver-specific attributes within this. -@@ -1932,6 +1988,12 @@ enum nl80211_commands { - * multicast group. - * If set during %NL80211_CMD_ASSOCIATE or %NL80211_CMD_CONNECT the - * station will deauthenticate when the socket is closed. -+ * If set during %NL80211_CMD_JOIN_IBSS the IBSS will be automatically -+ * torn down when the socket is closed. -+ * If set during %NL80211_CMD_JOIN_MESH the mesh setup will be -+ * automatically torn down when the socket is closed. -+ * If set during %NL80211_CMD_START_AP the AP will be automatically -+ * disabled when the socket is closed. - * - * @NL80211_ATTR_TDLS_INITIATOR: flag attribute indicating the current end is - * the TDLS link initiator. -@@ -2153,6 +2215,35 @@ enum nl80211_commands { - * @NL80211_ATTR_PMKR0_NAME: PMK-R0 Name for offloaded FT. - * @NL80211_ATTR_PORT_AUTHORIZED: (reserved) - * -+ * @NL80211_ATTR_EXTERNAL_AUTH_ACTION: Identify the requested external -+ * authentication operation (u32 attribute with an -+ * &enum nl80211_external_auth_action value). This is used with the -+ * %NL80211_CMD_EXTERNAL_AUTH request event. -+ * @NL80211_ATTR_EXTERNAL_AUTH_SUPPORT: Flag attribute indicating that the user -+ * space supports external authentication. This attribute shall be used -+ * only with %NL80211_CMD_CONNECT request. The driver may offload -+ * authentication processing to user space if this capability is indicated -+ * in NL80211_CMD_CONNECT requests from the user space. -+ * -+ * @NL80211_ATTR_NSS: Station's New/updated RX_NSS value notified using this -+ * u8 attribute. This is used with %NL80211_CMD_STA_OPMODE_CHANGED. -+ * -+ * @NL80211_ATTR_TXQ_STATS: TXQ statistics (nested attribute, see &enum -+ * nl80211_txq_stats) -+ * @NL80211_ATTR_TXQ_LIMIT: Total packet limit for the TXQ queues for this phy. -+ * The smaller of this and the memory limit is enforced. -+ * @NL80211_ATTR_TXQ_MEMORY_LIMIT: Total memory memory limit (in bytes) for the -+ * TXQ queues for this phy. The smaller of this and the packet limit is -+ * enforced. -+ * @NL80211_ATTR_TXQ_QUANTUM: TXQ scheduler quantum (bytes). Number of bytes -+ * a flow is assigned on each round of the DRR scheduler. -+ * @NL80211_ATTR_HE_CAPABILITY: HE Capability information element (from -+ * association request when used with NL80211_CMD_NEW_STATION). Can be set -+ * only if %NL80211_STA_FLAG_WME is set. -+ * + * @NL80211_ATTR_WIPHY_ANTENNA_GAIN: Configured antenna gain. Used to reduce + * transmit power to stay within regulatory limits. u32, dBi. + * * @NUM_NL80211_ATTR: total number of nl80211_attrs available * @NL80211_ATTR_MAX: highest attribute number currently defined * @__NL80211_ATTR_AFTER_LAST: internal use -@@ -2579,6 +2670,23 @@ enum nl80211_attrs { - NL80211_ATTR_PMKR0_NAME, - NL80211_ATTR_PORT_AUTHORIZED, +@@ -2748,6 +2751,8 @@ enum nl80211_attrs { + + NL80211_ATTR_PEER_MEASUREMENTS, -+ NL80211_ATTR_EXTERNAL_AUTH_ACTION, -+ NL80211_ATTR_EXTERNAL_AUTH_SUPPORT, -+ -+ NL80211_ATTR_NSS, -+ NL80211_ATTR_ACK_SIGNAL, -+ -+ NL80211_ATTR_CONTROL_PORT_OVER_NL80211, -+ -+ NL80211_ATTR_TXQ_STATS, -+ NL80211_ATTR_TXQ_LIMIT, -+ NL80211_ATTR_TXQ_MEMORY_LIMIT, -+ NL80211_ATTR_TXQ_QUANTUM, -+ -+ NL80211_ATTR_HE_CAPABILITY, -+ + NL80211_ATTR_WIPHY_ANTENNA_GAIN, + /* add attributes here, update the policy in nl80211.c */ __NL80211_ATTR_AFTER_LAST, -@@ -2618,6 +2726,8 @@ enum nl80211_attrs { - #define NL80211_ATTR_KEYS NL80211_ATTR_KEYS - #define NL80211_ATTR_FEATURE_FLAGS NL80211_ATTR_FEATURE_FLAGS - -+#define NL80211_WIPHY_NAME_MAXLEN 64 -+ - #define NL80211_MAX_SUPP_RATES 32 - #define NL80211_MAX_SUPP_HT_RATES 77 - #define NL80211_MAX_SUPP_REG_RULES 64 -@@ -2626,7 +2736,8 @@ enum nl80211_attrs { - #define NL80211_TKIP_DATA_OFFSET_RX_MIC_KEY 24 - #define NL80211_HT_CAPABILITY_LEN 26 - #define NL80211_VHT_CAPABILITY_LEN 12 -- -+#define NL80211_HE_MIN_CAPABILITY_LEN 16 -+#define NL80211_HE_MAX_CAPABILITY_LEN 51 - #define NL80211_MAX_NR_CIPHER_SUITES 5 - #define NL80211_MAX_NR_AKM_SUITES 2 - -@@ -2754,6 +2865,38 @@ struct nl80211_sta_flag_update { - } __attribute__((packed)); - - /** -+ * enum nl80211_he_gi - HE guard interval -+ * @NL80211_RATE_INFO_HE_GI_0_8: 0.8 usec -+ * @NL80211_RATE_INFO_HE_GI_1_6: 1.6 usec -+ * @NL80211_RATE_INFO_HE_GI_3_2: 3.2 usec -+ */ -+enum nl80211_he_gi { -+ NL80211_RATE_INFO_HE_GI_0_8, -+ NL80211_RATE_INFO_HE_GI_1_6, -+ NL80211_RATE_INFO_HE_GI_3_2, -+}; -+ -+/** -+ * enum nl80211_he_ru_alloc - HE RU allocation values -+ * @NL80211_RATE_INFO_HE_RU_ALLOC_26: 26-tone RU allocation -+ * @NL80211_RATE_INFO_HE_RU_ALLOC_52: 52-tone RU allocation -+ * @NL80211_RATE_INFO_HE_RU_ALLOC_106: 106-tone RU allocation -+ * @NL80211_RATE_INFO_HE_RU_ALLOC_242: 242-tone RU allocation -+ * @NL80211_RATE_INFO_HE_RU_ALLOC_484: 484-tone RU allocation -+ * @NL80211_RATE_INFO_HE_RU_ALLOC_996: 996-tone RU allocation -+ * @NL80211_RATE_INFO_HE_RU_ALLOC_2x996: 2x996-tone RU allocation -+ */ -+enum nl80211_he_ru_alloc { -+ NL80211_RATE_INFO_HE_RU_ALLOC_26, -+ NL80211_RATE_INFO_HE_RU_ALLOC_52, -+ NL80211_RATE_INFO_HE_RU_ALLOC_106, -+ NL80211_RATE_INFO_HE_RU_ALLOC_242, -+ NL80211_RATE_INFO_HE_RU_ALLOC_484, -+ NL80211_RATE_INFO_HE_RU_ALLOC_996, -+ NL80211_RATE_INFO_HE_RU_ALLOC_2x996, -+}; -+ -+/** - * enum nl80211_rate_info - bitrate information - * - * These attribute types are used with %NL80211_STA_INFO_TXRATE -@@ -2785,6 +2928,13 @@ struct nl80211_sta_flag_update { - * @NL80211_RATE_INFO_5_MHZ_WIDTH: 5 MHz width - note that this is - * a legacy rate and will be reported as the actual bitrate, i.e. - * a quarter of the base (20 MHz) rate -+ * @NL80211_RATE_INFO_HE_MCS: HE MCS index (u8, 0-11) -+ * @NL80211_RATE_INFO_HE_NSS: HE NSS value (u8, 1-8) -+ * @NL80211_RATE_INFO_HE_GI: HE guard interval identifier -+ * (u8, see &enum nl80211_he_gi) -+ * @NL80211_RATE_INFO_HE_DCM: HE DCM value (u8, 0/1) -+ * @NL80211_RATE_INFO_RU_ALLOC: HE RU allocation, if not present then -+ * non-OFDMA was used (u8, see &enum nl80211_he_ru_alloc) - * @__NL80211_RATE_INFO_AFTER_LAST: internal use - */ - enum nl80211_rate_info { -@@ -2801,6 +2951,11 @@ enum nl80211_rate_info { - NL80211_RATE_INFO_160_MHZ_WIDTH, - NL80211_RATE_INFO_10_MHZ_WIDTH, - NL80211_RATE_INFO_5_MHZ_WIDTH, -+ NL80211_RATE_INFO_HE_MCS, -+ NL80211_RATE_INFO_HE_NSS, -+ NL80211_RATE_INFO_HE_GI, -+ NL80211_RATE_INFO_HE_DCM, -+ NL80211_RATE_INFO_HE_RU_ALLOC, - - /* keep last */ - __NL80211_RATE_INFO_AFTER_LAST, -@@ -2899,6 +3054,9 @@ enum nl80211_sta_bss_param { - * @NL80211_STA_INFO_RX_DURATION: aggregate PPDU duration for all frames - * received from the station (u64, usec) - * @NL80211_STA_INFO_PAD: attribute used for padding for 64-bit alignment -+ * @NL80211_STA_INFO_ACK_SIGNAL: signal strength of the last ACK frame(u8, dBm) -+ * @NL80211_STA_INFO_DATA_ACK_SIGNAL_AVG: avg signal strength of (data) -+ * ACK frame (s8, dBm) - * @__NL80211_STA_INFO_AFTER_LAST: internal - * @NL80211_STA_INFO_MAX: highest possible station info attribute - */ -@@ -2937,6 +3095,8 @@ enum nl80211_sta_info { - NL80211_STA_INFO_TID_STATS, - NL80211_STA_INFO_RX_DURATION, - NL80211_STA_INFO_PAD, -+ NL80211_STA_INFO_ACK_SIGNAL, -+ NL80211_STA_INFO_DATA_ACK_SIGNAL_AVG, - - /* keep last */ - __NL80211_STA_INFO_AFTER_LAST, -@@ -2954,6 +3114,7 @@ enum nl80211_sta_info { - * @NL80211_TID_STATS_TX_MSDU_FAILED: number of failed transmitted - * MSDUs (u64) - * @NL80211_TID_STATS_PAD: attribute used for padding for 64-bit alignment -+ * @NL80211_TID_STATS_TXQ_STATS: TXQ stats (nested attribute) - * @NUM_NL80211_TID_STATS: number of attributes here - * @NL80211_TID_STATS_MAX: highest numbered attribute here - */ -@@ -2964,6 +3125,7 @@ enum nl80211_tid_stats { - NL80211_TID_STATS_TX_MSDU_RETRIES, - NL80211_TID_STATS_TX_MSDU_FAILED, - NL80211_TID_STATS_PAD, -+ NL80211_TID_STATS_TXQ_STATS, - - /* keep last */ - NUM_NL80211_TID_STATS, -@@ -2971,6 +3133,44 @@ enum nl80211_tid_stats { - }; - - /** -+ * enum nl80211_txq_stats - per TXQ statistics attributes -+ * @__NL80211_TXQ_STATS_INVALID: attribute number 0 is reserved -+ * @NUM_NL80211_TXQ_STATS: number of attributes here -+ * @NL80211_TXQ_STATS_BACKLOG_BYTES: number of bytes currently backlogged -+ * @NL80211_TXQ_STATS_BACKLOG_PACKETS: number of packets currently -+ * backlogged -+ * @NL80211_TXQ_STATS_FLOWS: total number of new flows seen -+ * @NL80211_TXQ_STATS_DROPS: total number of packet drops -+ * @NL80211_TXQ_STATS_ECN_MARKS: total number of packet ECN marks -+ * @NL80211_TXQ_STATS_OVERLIMIT: number of drops due to queue space overflow -+ * @NL80211_TXQ_STATS_OVERMEMORY: number of drops due to memory limit overflow -+ * (only for per-phy stats) -+ * @NL80211_TXQ_STATS_COLLISIONS: number of hash collisions -+ * @NL80211_TXQ_STATS_TX_BYTES: total number of bytes dequeued from TXQ -+ * @NL80211_TXQ_STATS_TX_PACKETS: total number of packets dequeued from TXQ -+ * @NL80211_TXQ_STATS_MAX_FLOWS: number of flow buckets for PHY -+ * @NL80211_TXQ_STATS_MAX: highest numbered attribute here -+ */ -+enum nl80211_txq_stats { -+ __NL80211_TXQ_STATS_INVALID, -+ NL80211_TXQ_STATS_BACKLOG_BYTES, -+ NL80211_TXQ_STATS_BACKLOG_PACKETS, -+ NL80211_TXQ_STATS_FLOWS, -+ NL80211_TXQ_STATS_DROPS, -+ NL80211_TXQ_STATS_ECN_MARKS, -+ NL80211_TXQ_STATS_OVERLIMIT, -+ NL80211_TXQ_STATS_OVERMEMORY, -+ NL80211_TXQ_STATS_COLLISIONS, -+ NL80211_TXQ_STATS_TX_BYTES, -+ NL80211_TXQ_STATS_TX_PACKETS, -+ NL80211_TXQ_STATS_MAX_FLOWS, -+ -+ /* keep last */ -+ NUM_NL80211_TXQ_STATS, -+ NL80211_TXQ_STATS_MAX = NUM_NL80211_TXQ_STATS - 1 -+}; -+ -+/** - * enum nl80211_mpath_flags - nl80211 mesh path flags - * - * @NL80211_MPATH_FLAG_ACTIVE: the mesh path is active -@@ -3022,6 +3222,38 @@ enum nl80211_mpath_info { - }; - - /** -+ * enum nl80211_band_iftype_attr - Interface type data attributes -+ * -+ * @__NL80211_BAND_IFTYPE_ATTR_INVALID: attribute number 0 is reserved -+ * @NL80211_BAND_IFTYPE_ATTR_IFTYPES: nested attribute containing a flag attribute -+ * for each interface type that supports the band data -+ * @NL80211_BAND_IFTYPE_ATTR_HE_CAP_MAC: HE MAC capabilities as in HE -+ * capabilities IE -+ * @NL80211_BAND_IFTYPE_ATTR_HE_CAP_PHY: HE PHY capabilities as in HE -+ * capabilities IE -+ * @NL80211_BAND_IFTYPE_ATTR_HE_CAP_MCS_SET: HE supported NSS/MCS as in HE -+ * capabilities IE -+ * @NL80211_BAND_IFTYPE_ATTR_HE_CAP_PPE: HE PPE thresholds information as -+ * defined in HE capabilities IE -+ * @NL80211_BAND_IFTYPE_ATTR_MAX: highest band HE capability attribute currently -+ * defined -+ * @__NL80211_BAND_IFTYPE_ATTR_AFTER_LAST: internal use -+ */ -+enum nl80211_band_iftype_attr { -+ __NL80211_BAND_IFTYPE_ATTR_INVALID, -+ -+ NL80211_BAND_IFTYPE_ATTR_IFTYPES, -+ NL80211_BAND_IFTYPE_ATTR_HE_CAP_MAC, -+ NL80211_BAND_IFTYPE_ATTR_HE_CAP_PHY, -+ NL80211_BAND_IFTYPE_ATTR_HE_CAP_MCS_SET, -+ NL80211_BAND_IFTYPE_ATTR_HE_CAP_PPE, -+ -+ /* keep last */ -+ __NL80211_BAND_IFTYPE_ATTR_AFTER_LAST, -+ NL80211_BAND_IFTYPE_ATTR_MAX = __NL80211_BAND_IFTYPE_ATTR_AFTER_LAST - 1 -+}; -+ -+/** - * enum nl80211_band_attr - band attributes - * @__NL80211_BAND_ATTR_INVALID: attribute number 0 is reserved - * @NL80211_BAND_ATTR_FREQS: supported frequencies in this band, -@@ -3036,6 +3268,8 @@ enum nl80211_mpath_info { - * @NL80211_BAND_ATTR_VHT_MCS_SET: 32-byte attribute containing the MCS set as - * defined in 802.11ac - * @NL80211_BAND_ATTR_VHT_CAPA: VHT capabilities, as in the HT information IE -+ * @NL80211_BAND_ATTR_IFTYPE_DATA: nested array attribute, with each entry using -+ * attributes from &enum nl80211_band_iftype_attr - * @NL80211_BAND_ATTR_MAX: highest band attribute currently defined - * @__NL80211_BAND_ATTR_AFTER_LAST: internal use - */ -@@ -3051,6 +3285,7 @@ enum nl80211_band_attr { - - NL80211_BAND_ATTR_VHT_MCS_SET, - NL80211_BAND_ATTR_VHT_CAPA, -+ NL80211_BAND_ATTR_IFTYPE_DATA, - - /* keep last */ - __NL80211_BAND_ATTR_AFTER_LAST, -@@ -3060,6 +3295,29 @@ enum nl80211_band_attr { - #define NL80211_BAND_ATTR_HT_CAPA NL80211_BAND_ATTR_HT_CAPA - - /** -+ * enum nl80211_wmm_rule - regulatory wmm rule -+ * -+ * @__NL80211_WMMR_INVALID: attribute number 0 is reserved -+ * @NL80211_WMMR_CW_MIN: Minimum contention window slot. -+ * @NL80211_WMMR_CW_MAX: Maximum contention window slot. -+ * @NL80211_WMMR_AIFSN: Arbitration Inter Frame Space. -+ * @NL80211_WMMR_TXOP: Maximum allowed tx operation time. -+ * @nl80211_WMMR_MAX: highest possible wmm rule. -+ * @__NL80211_WMMR_LAST: Internal use. -+ */ -+enum nl80211_wmm_rule { -+ __NL80211_WMMR_INVALID, -+ NL80211_WMMR_CW_MIN, -+ NL80211_WMMR_CW_MAX, -+ NL80211_WMMR_AIFSN, -+ NL80211_WMMR_TXOP, -+ -+ /* keep last */ -+ __NL80211_WMMR_LAST, -+ NL80211_WMMR_MAX = __NL80211_WMMR_LAST - 1 -+}; -+ -+/** - * enum nl80211_frequency_attr - frequency attributes - * @__NL80211_FREQUENCY_ATTR_INVALID: attribute number 0 is reserved - * @NL80211_FREQUENCY_ATTR_FREQ: Frequency in MHz -@@ -3108,6 +3366,9 @@ enum nl80211_band_attr { - * on this channel in current regulatory domain. - * @NL80211_FREQUENCY_ATTR_NO_10MHZ: 10 MHz operation is not allowed - * on this channel in current regulatory domain. -+ * @NL80211_FREQUENCY_ATTR_WMM: this channel has wmm limitations. -+ * This is a nested attribute that contains the wmm limitation per AC. -+ * (see &enum nl80211_wmm_rule) - * @NL80211_FREQUENCY_ATTR_MAX: highest frequency attribute number - * currently defined - * @__NL80211_FREQUENCY_ATTR_AFTER_LAST: internal use -@@ -3136,6 +3397,7 @@ enum nl80211_frequency_attr { - NL80211_FREQUENCY_ATTR_IR_CONCURRENT, - NL80211_FREQUENCY_ATTR_NO_20MHZ, - NL80211_FREQUENCY_ATTR_NO_10MHZ, -+ NL80211_FREQUENCY_ATTR_WMM, - - /* keep last */ - __NL80211_FREQUENCY_ATTR_AFTER_LAST, -@@ -3319,7 +3581,7 @@ enum nl80211_sched_scan_match_attr { - * @NL80211_RRF_AUTO_BW: maximum available bandwidth should be calculated - * base on contiguous rules and wider channels will be allowed to cross - * multiple contiguous/overlapping frequency ranges. -- * @NL80211_RRF_IR_CONCURRENT: See &NL80211_FREQUENCY_ATTR_IR_CONCURRENT -+ * @NL80211_RRF_IR_CONCURRENT: See %NL80211_FREQUENCY_ATTR_IR_CONCURRENT - * @NL80211_RRF_NO_HT40MINUS: channels can't be used in HT40- operation - * @NL80211_RRF_NO_HT40PLUS: channels can't be used in HT40+ operation - * @NL80211_RRF_NO_80MHZ: 80MHz operation not allowed -@@ -4945,6 +5207,27 @@ enum nl80211_feature_flags { - * probe request tx deferral and suppression - * @NL80211_EXT_FEATURE_MFP_OPTIONAL: Driver supports the %NL80211_MFP_OPTIONAL - * value in %NL80211_ATTR_USE_MFP. -+ * @NL80211_EXT_FEATURE_LOW_SPAN_SCAN: Driver supports low span scan. -+ * @NL80211_EXT_FEATURE_LOW_POWER_SCAN: Driver supports low power scan. -+ * @NL80211_EXT_FEATURE_HIGH_ACCURACY_SCAN: Driver supports high accuracy scan. -+ * @NL80211_EXT_FEATURE_DFS_OFFLOAD: HW/driver will offload DFS actions. -+ * Device or driver will do all DFS-related actions by itself, -+ * informing user-space about CAC progress, radar detection event, -+ * channel change triggered by radar detection event. -+ * No need to start CAC from user-space, no need to react to -+ * "radar detected" event. -+ * @NL80211_EXT_FEATURE_CONTROL_PORT_OVER_NL80211: Driver supports sending and -+ * receiving control port frames over nl80211 instead of the netdevice. -+ * @NL80211_EXT_FEATURE_DATA_ACK_SIGNAL_SUPPORT: This Driver support data ack -+ * rssi if firmware support, this flag is to intimate about ack rssi -+ * support to nl80211. -+ * @NL80211_EXT_FEATURE_TXQS: Driver supports FQ-CoDel-enabled intermediate -+ * TXQs. -+ * @NL80211_EXT_FEATURE_SCAN_RANDOM_SN: Driver/device supports randomizing the -+ * SN in probe request frames if requested by %NL80211_SCAN_FLAG_RANDOM_SN. -+ * @NL80211_EXT_FEATURE_SCAN_MIN_PREQ_CONTENT: Driver/device can omit all data -+ * except for supported rates from the probe request content if requested -+ * by the %NL80211_SCAN_FLAG_MIN_PREQ_CONTENT flag. - * - * @NUM_NL80211_EXT_FEATURES: number of extended features. - * @MAX_NL80211_EXT_FEATURES: highest extended feature index. -@@ -4972,6 +5255,15 @@ enum nl80211_ext_feature_index { - NL80211_EXT_FEATURE_OCE_PROBE_REQ_HIGH_TX_RATE, - NL80211_EXT_FEATURE_OCE_PROBE_REQ_DEFERRAL_SUPPRESSION, - NL80211_EXT_FEATURE_MFP_OPTIONAL, -+ NL80211_EXT_FEATURE_LOW_SPAN_SCAN, -+ NL80211_EXT_FEATURE_LOW_POWER_SCAN, -+ NL80211_EXT_FEATURE_HIGH_ACCURACY_SCAN, -+ NL80211_EXT_FEATURE_DFS_OFFLOAD, -+ NL80211_EXT_FEATURE_CONTROL_PORT_OVER_NL80211, -+ NL80211_EXT_FEATURE_DATA_ACK_SIGNAL_SUPPORT, -+ NL80211_EXT_FEATURE_TXQS, -+ NL80211_EXT_FEATURE_SCAN_RANDOM_SN, -+ NL80211_EXT_FEATURE_SCAN_MIN_PREQ_CONTENT, - - /* add new features before the definition below */ - NUM_NL80211_EXT_FEATURES, -@@ -5032,6 +5324,10 @@ enum nl80211_timeout_reason { - * of NL80211_CMD_TRIGGER_SCAN and NL80211_CMD_START_SCHED_SCAN - * requests. - * -+ * NL80211_SCAN_FLAG_LOW_SPAN, NL80211_SCAN_FLAG_LOW_POWER, and -+ * NL80211_SCAN_FLAG_HIGH_ACCURACY flags are exclusive of each other, i.e., only -+ * one of them can be used in the request. -+ * - * @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 -@@ -5059,7 +5355,26 @@ enum nl80211_timeout_reason { - * and suppression (if it has received a broadcast Probe Response frame, - * Beacon frame or FILS Discovery frame from an AP that the STA considers - * a suitable candidate for (re-)association - suitable in terms of -- * SSID and/or RSSI -+ * SSID and/or RSSI. -+ * @NL80211_SCAN_FLAG_LOW_SPAN: Span corresponds to the total time taken to -+ * accomplish the scan. Thus, this flag intends the driver to perform the -+ * scan request with lesser span/duration. It is specific to the driver -+ * implementations on how this is accomplished. Scan accuracy may get -+ * impacted with this flag. -+ * @NL80211_SCAN_FLAG_LOW_POWER: This flag intends the scan attempts to consume -+ * optimal possible power. Drivers can resort to their specific means to -+ * optimize the power. Scan accuracy may get impacted with this flag. -+ * @NL80211_SCAN_FLAG_HIGH_ACCURACY: Accuracy here intends to the extent of scan -+ * results obtained. Thus HIGH_ACCURACY scan flag aims to get maximum -+ * possible scan results. This flag hints the driver to use the best -+ * possible scan configuration to improve the accuracy in scanning. -+ * Latency and power use may get impacted with this flag. -+ * @NL80211_SCAN_FLAG_RANDOM_SN: randomize the sequence number in probe -+ * request frames from this scan to avoid correlation/tracking being -+ * possible. -+ * @NL80211_SCAN_FLAG_MIN_PREQ_CONTENT: minimize probe request content to -+ * only have supported rates and no additional capabilities (unless -+ * added by userspace explicitly.) - */ - enum nl80211_scan_flags { - NL80211_SCAN_FLAG_LOW_PRIORITY = 1<<0, -@@ -5070,6 +5385,11 @@ enum nl80211_scan_flags { - NL80211_SCAN_FLAG_ACCEPT_BCAST_PROBE_RESP = 1<<5, - NL80211_SCAN_FLAG_OCE_PROBE_REQ_HIGH_TX_RATE = 1<<6, - NL80211_SCAN_FLAG_OCE_PROBE_REQ_DEFERRAL_SUPPRESSION = 1<<7, -+ NL80211_SCAN_FLAG_LOW_SPAN = 1<<8, -+ NL80211_SCAN_FLAG_LOW_POWER = 1<<9, -+ NL80211_SCAN_FLAG_HIGH_ACCURACY = 1<<10, -+ NL80211_SCAN_FLAG_RANDOM_SN = 1<<11, -+ NL80211_SCAN_FLAG_MIN_PREQ_CONTENT = 1<<12, - }; - - /** -@@ -5127,6 +5447,8 @@ enum nl80211_smps_mode { - * non-operating channel is expired and no longer valid. New CAC must - * be done on this channel before starting the operation. This is not - * applicable for ETSI dfs domain where pre-CAC is valid for ever. -+ * @NL80211_RADAR_CAC_STARTED: Channel Availability Check has been started, -+ * should be generated by HW if NL80211_EXT_FEATURE_DFS_OFFLOAD is enabled. - */ - enum nl80211_radar_event { - NL80211_RADAR_DETECTED, -@@ -5134,6 +5456,7 @@ enum nl80211_radar_event { - NL80211_RADAR_CAC_ABORTED, - NL80211_RADAR_NOP_FINISHED, - NL80211_RADAR_PRE_CAC_EXPIRED, -+ NL80211_RADAR_CAC_STARTED, - }; - - /** -@@ -5425,11 +5748,11 @@ enum nl80211_nan_func_attributes { - * @NL80211_NAN_SRF_INCLUDE: present if the include bit of the SRF set. - * This is a flag. - * @NL80211_NAN_SRF_BF: Bloom Filter. Present if and only if -- * &NL80211_NAN_SRF_MAC_ADDRS isn't present. This attribute is binary. -+ * %NL80211_NAN_SRF_MAC_ADDRS isn't present. This attribute is binary. - * @NL80211_NAN_SRF_BF_IDX: index of the Bloom Filter. Mandatory if -- * &NL80211_NAN_SRF_BF is present. This is a u8. -+ * %NL80211_NAN_SRF_BF is present. This is a u8. - * @NL80211_NAN_SRF_MAC_ADDRS: list of MAC addresses for the SRF. Present if -- * and only if &NL80211_NAN_SRF_BF isn't present. This is a nested -+ * and only if %NL80211_NAN_SRF_BF isn't present. This is a nested - * attribute. Each nested attribute is a MAC address. - * @NUM_NL80211_NAN_SRF_ATTR: internal - * @NL80211_NAN_SRF_ATTR_MAX: highest NAN SRF attribute -@@ -5469,4 +5792,15 @@ enum nl80211_nan_match_attributes { - NL80211_NAN_MATCH_ATTR_MAX = NUM_NL80211_NAN_MATCH_ATTR - 1 - }; - -+/** -+ * nl80211_external_auth_action - Action to perform with external -+ * authentication request. Used by NL80211_ATTR_EXTERNAL_AUTH_ACTION. -+ * @NL80211_EXTERNAL_AUTH_START: Start the authentication. -+ * @NL80211_EXTERNAL_AUTH_ABORT: Abort the ongoing authentication. -+ */ -+enum nl80211_external_auth_action { -+ NL80211_EXTERNAL_AUTH_START, -+ NL80211_EXTERNAL_AUTH_ABORT, -+}; -+ - #endif /* __LINUX_NL80211_H */ diff --git a/package/network/utils/iw/patches/120-antenna_gain.patch b/package/network/utils/iw/patches/120-antenna_gain.patch index 27ba390c7f..c81bcab602 100644 --- a/package/network/utils/iw/patches/120-antenna_gain.patch +++ b/package/network/utils/iw/patches/120-antenna_gain.patch @@ -1,9 +1,9 @@ --- a/phy.c +++ b/phy.c -@@ -727,3 +727,30 @@ COMMAND(set, antenna, " | all | - NL80211_CMD_SET_WIPHY, 0, CIB_PHY, handle_antenna, - "Set a bitmap of allowed antennas to use for TX and RX.\n" - "The driver may reject antenna configurations it cannot support."); +@@ -843,3 +843,30 @@ static int handle_get_txq(struct nl80211 + COMMAND(get, txq, "", + NL80211_CMD_GET_WIPHY, 0, CIB_PHY, handle_get_txq, + "Get TXQ parameters."); + +static int handle_antenna_gain(struct nl80211_state *state, + struct nl_msg *msg, diff --git a/package/network/utils/iw/patches/200-reduce_size.patch b/package/network/utils/iw/patches/200-reduce_size.patch index 5f4bce6a8b..07ea7113e2 100644 --- a/package/network/utils/iw/patches/200-reduce_size.patch +++ b/package/network/utils/iw/patches/200-reduce_size.patch @@ -1,6 +1,6 @@ --- a/event.c +++ b/event.c -@@ -342,6 +342,7 @@ static int print_event(struct nl_msg *ms +@@ -699,6 +699,7 @@ static int print_event(struct nl_msg *ms } switch (gnlh->cmd) { @@ -8,7 +8,7 @@ case NL80211_CMD_NEW_WIPHY: printf("renamed to %s\n", nla_get_string(tb[NL80211_ATTR_WIPHY_NAME])); break; -@@ -376,6 +377,7 @@ static int print_event(struct nl_msg *ms +@@ -734,6 +735,7 @@ static int print_event(struct nl_msg *ms case NL80211_CMD_SCHED_SCAN_RESULTS: printf("got scheduled scan results\n"); break; @@ -16,7 +16,7 @@ case NL80211_CMD_REG_CHANGE: printf("regulatory domain change: "); -@@ -454,6 +456,7 @@ static int print_event(struct nl_msg *ms +@@ -812,6 +814,7 @@ static int print_event(struct nl_msg *ms mac_addr_n2a(macbuf, nla_data(tb[NL80211_ATTR_MAC])); printf("del station %s\n", macbuf); break; @@ -24,10 +24,10 @@ case NL80211_CMD_JOIN_IBSS: mac_addr_n2a(macbuf, nla_data(tb[NL80211_ATTR_MAC])); printf("IBSS %s joined\n", macbuf); -@@ -618,9 +621,9 @@ static int print_event(struct nl_msg *ms - case NL80211_CMD_DEL_WIPHY: - printf("delete wiphy\n"); +@@ -989,9 +992,9 @@ static int print_event(struct nl_msg *ms + parse_nan_match(tb); break; + } +#endif default: - printf("unknown event %d (%s)\n", @@ -38,7 +38,7 @@ --- a/info.c +++ b/info.c -@@ -197,6 +197,7 @@ next: +@@ -205,6 +205,7 @@ next: } } @@ -46,7 +46,7 @@ if (tb_band[NL80211_BAND_ATTR_RATES]) { printf("\t\tBitrates (non-HT):\n"); nla_for_each_nested(nl_rate, tb_band[NL80211_BAND_ATTR_RATES], rem_rate) { -@@ -213,6 +214,7 @@ next: +@@ -221,6 +222,7 @@ next: printf("\n"); } } @@ -54,7 +54,7 @@ } } -@@ -278,6 +280,7 @@ next: +@@ -286,6 +288,7 @@ next: printf("\tCoverage class: %d (up to %dm)\n", coverage, 450 * coverage); } @@ -62,7 +62,7 @@ if (tb_msg[NL80211_ATTR_CIPHER_SUITES]) { int num = nla_len(tb_msg[NL80211_ATTR_CIPHER_SUITES]) / sizeof(__u32); int i; -@@ -289,6 +292,7 @@ next: +@@ -297,6 +300,7 @@ next: cipher_name(ciphers[i])); } } @@ -70,7 +70,7 @@ if (tb_msg[NL80211_ATTR_WIPHY_ANTENNA_AVAIL_TX] && tb_msg[NL80211_ATTR_WIPHY_ANTENNA_AVAIL_RX]) -@@ -308,11 +312,13 @@ next: +@@ -316,11 +320,13 @@ next: printf("\t\t * %s\n", iftype_name(nla_type(nl_mode))); } @@ -84,7 +84,7 @@ if (tb_msg[NL80211_ATTR_INTERFACE_COMBINATIONS]) { struct nlattr *nl_combi; -@@ -409,6 +415,7 @@ broken_combination: +@@ -417,6 +423,7 @@ broken_combination: printf("\tinterface combinations are not supported\n"); } @@ -92,7 +92,7 @@ if (tb_msg[NL80211_ATTR_SUPPORTED_COMMANDS]) { printf("\tSupported commands:\n"); nla_for_each_nested(nl_cmd, tb_msg[NL80211_ATTR_SUPPORTED_COMMANDS], rem_cmd) -@@ -506,6 +513,7 @@ broken_combination: +@@ -514,6 +521,7 @@ broken_combination: printf("\t\t * wake up on TCP connection\n"); } } @@ -100,7 +100,7 @@ if (tb_msg[NL80211_ATTR_ROAM_SUPPORT]) printf("\tDevice supports roaming.\n"); -@@ -544,6 +552,7 @@ broken_combination: +@@ -552,6 +560,7 @@ broken_combination: } } @@ -108,15 +108,15 @@ if (tb_msg[NL80211_ATTR_FEATURE_FLAGS]) { unsigned int features = nla_get_u32(tb_msg[NL80211_ATTR_FEATURE_FLAGS]); -@@ -602,6 +611,7 @@ broken_combination: - if (features & NL80211_FEATURE_TDLS_CHANNEL_SWITCH) - printf("\tDevice supports TDLS channel switching\n"); +@@ -616,6 +625,7 @@ broken_combination: + if (features & NL80211_FEATURE_ND_RANDOM_MAC_ADDR) + printf("\tDevice supports randomizing MAC-addr in net-detect scans.\n"); } +#endif - if (tb_msg[NL80211_ATTR_EXT_FEATURES]) { - struct nlattr *tb = tb_msg[NL80211_ATTR_EXT_FEATURES]; -@@ -658,6 +668,7 @@ TOPLEVEL(list, NULL, NL80211_CMD_GET_WIP + if (tb_msg[NL80211_ATTR_TDLS_SUPPORT]) + printf("\tDevice supports T-DLS.\n"); +@@ -740,6 +750,7 @@ TOPLEVEL(list, NULL, NL80211_CMD_GET_WIP "List all wireless devices and their capabilities."); TOPLEVEL(phy, NULL, NL80211_CMD_GET_WIPHY, NLM_F_DUMP, CIB_NONE, handle_info, NULL); @@ -124,7 +124,7 @@ static int handle_commands(struct nl80211_state *state, struct nl_msg *msg, int argc, char **argv, enum id_input id) { -@@ -669,6 +680,7 @@ static int handle_commands(struct nl8021 +@@ -751,6 +762,7 @@ static int handle_commands(struct nl8021 } TOPLEVEL(commands, NULL, NL80211_CMD_GET_WIPHY, 0, CIB_NONE, handle_commands, "list all known commands and their decimal & hex value"); @@ -134,15 +134,17 @@ { --- a/scan.c +++ b/scan.c -@@ -1170,6 +1170,7 @@ static void print_ht_op(const uint8_t ty +@@ -1197,6 +1197,9 @@ static void print_ht_op(const uint8_t ty printf("\t\t * secondary channel offset: %s\n", ht_secondary_offset[data[1] & 0x3]); printf("\t\t * STA channel width: %s\n", sta_chan_width[(data[1] & 0x4)>>2]); ++#ifndef IW_FULL + return; ++#endif printf("\t\t * RIFS: %d\n", (data[1] & 0x8)>>3); printf("\t\t * HT protection: %s\n", protection[data[2] & 0x3]); printf("\t\t * non-GF present: %d\n", (data[2] & 0x4) >> 2); -@@ -1497,6 +1498,14 @@ static void print_ie(const struct ie_pri +@@ -1524,6 +1527,14 @@ static void print_ie(const struct ie_pri static const struct ie_print ieprinters[] = { [0] = { "SSID", print_ssid, 0, 32, BIT(PRINT_SCAN) | BIT(PRINT_LINK), }, @@ -157,7 +159,7 @@ [1] = { "Supported rates", print_supprates, 0, 255, BIT(PRINT_SCAN), }, [3] = { "DS Parameter set", print_ds, 1, 1, BIT(PRINT_SCAN), }, [5] = { "TIM", print_tim, 4, 255, BIT(PRINT_SCAN), }, -@@ -1506,21 +1515,15 @@ static const struct ie_print ieprinters[ +@@ -1533,21 +1544,15 @@ static const struct ie_print ieprinters[ [32] = { "Power constraint", print_powerconstraint, 1, 1, BIT(PRINT_SCAN), }, [35] = { "TPC report", print_tpcreport, 2, 2, BIT(PRINT_SCAN), }, [42] = { "ERP", print_erp, 1, 255, BIT(PRINT_SCAN), }, @@ -180,7 +182,7 @@ }; static void print_wifi_wpa(const uint8_t type, uint8_t len, const uint8_t *data, -@@ -1968,6 +1971,7 @@ void print_ies(unsigned char *ie, int ie +@@ -2026,6 +2031,7 @@ void print_ies(unsigned char *ie, int ie ieprinters[ie[0]].flags & BIT(ptype)) { print_ie(&ieprinters[ie[0]], ie[0], ie[1], ie + 2, &ie_buffer); @@ -188,7 +190,7 @@ } else if (ie[0] == 221 /* vendor */) { print_vendor(ie[1], ie + 2, unknown, ptype); } else if (unknown) { -@@ -1977,6 +1981,7 @@ void print_ies(unsigned char *ie, int ie +@@ -2035,6 +2041,7 @@ void print_ies(unsigned char *ie, int ie for (i=0; i [NOHT|HT20|HT40+|HT40-|5MHz|10MHz|80MHz] [beacons ] [block-tx]\n" -@@ -715,3 +718,4 @@ COMMAND(switch, freq, +@@ -721,3 +724,4 @@ COMMAND(switch, freq, "Switch the operating channel by sending a channel switch announcement (CSA)."); COMMAND(switch, channel, " [NOHT|HT20|HT40+|HT40-|5MHz|10MHz|80MHz] [beacons ] [block-tx]", NL80211_CMD_CHANNEL_SWITCH, 0, CIB_NETDEV, handle_chan, NULL);