package/network/utils/iw/patches/001-nl80211_h_sync.patch

   1 --- a/nl80211.h
   2 +++ b/nl80211.h
   3 @@ -301,29 +301,6 @@
   4   */
   5
   6  /**
   7 - * DOC: FILS shared key crypto offload
   8 - *
   9 - * This feature is applicable to drivers running in AP mode.
  10 - *
  11 - * FILS shared key crypto offload can be advertised by drivers by setting
  12 - * @NL80211_EXT_FEATURE_FILS_CRYPTO_OFFLOAD flag. The drivers that support
  13 - * FILS shared key crypto offload should be able to encrypt and decrypt
  14 - * association frames for FILS shared key authentication as per IEEE 802.11ai.
  15 - * With this capability, for FILS key derivation, drivers depend on userspace.
  16 - *
  17 - * After FILS key derivation, userspace shares the FILS AAD details with the
  18 - * driver and the driver stores the same to use in decryption of association
  19 - * request and in encryption of association response. The below parameters
  20 - * should be given to the driver in %NL80211_CMD_SET_FILS_AAD.
  21 - *     %NL80211_ATTR_MAC - STA MAC address, used for storing FILS AAD per STA
  22 - *     %NL80211_ATTR_FILS_KEK - Used for encryption or decryption
  23 - *     %NL80211_ATTR_FILS_NONCES - Used for encryption or decryption
  24 - *                     (STA Nonce 16 bytes followed by AP Nonce 16 bytes)
  25 - *
  26 - * Once the association is done, the driver cleans the FILS AAD data.
  27 - */
  28 -
  29 -/**
  30   * enum nl80211_commands - supported nl80211 commands
  31   *
  32   * @NL80211_CMD_UNSPEC: unspecified command to catch errors
  33 @@ -360,10 +337,7 @@
  34   * @NL80211_CMD_DEL_INTERFACE: Virtual interface was deleted, has attributes
  35   *     %NL80211_ATTR_IFINDEX and %NL80211_ATTR_WIPHY. Can also be sent from
  36   *     userspace to request deletion of a virtual interface, then requires
  37 - *     attribute %NL80211_ATTR_IFINDEX. If multiple BSSID advertisements are
  38 - *     enabled using %NL80211_ATTR_MBSSID_CONFIG, %NL80211_ATTR_MBSSID_ELEMS,
  39 - *     and if this command is used for the transmitting interface, then all
  40 - *     the non-transmitting interfaces are deleted as well.
  41 + *     attribute %NL80211_ATTR_IFINDEX.
  42   *
  43   * @NL80211_CMD_GET_KEY: Get sequence counter information for a key specified
  44   *     by %NL80211_ATTR_KEY_IDX and/or %NL80211_ATTR_MAC.
  45 @@ -1226,12 +1200,6 @@
  46   * @NL80211_CMD_COLOR_CHANGE_COMPLETED: Notify userland that the color change
  47   *     has completed
  48   *
  49 - * @NL80211_CMD_SET_FILS_AAD: Set FILS AAD data to the driver using -
  50 - *     &NL80211_ATTR_MAC - for STA MAC address
  51 - *     &NL80211_ATTR_FILS_KEK - for KEK
  52 - *     &NL80211_ATTR_FILS_NONCES - for FILS Nonces
  53 - *             (STA Nonce 16 bytes followed by AP Nonce 16 bytes)
  54 - *
  55   * @NL80211_CMD_MAX: highest used command number
  56   * @__NL80211_CMD_AFTER_LAST: internal use
  57   */
  58 @@ -1472,8 +1440,6 @@ enum nl80211_commands {
  59         NL80211_CMD_COLOR_CHANGE_ABORTED,
  60         NL80211_CMD_COLOR_CHANGE_COMPLETED,
  61
  62 -       NL80211_CMD_SET_FILS_AAD,
  63 -
  64         /* add new commands above here */
  65
  66         /* used to define NL80211_CMD_MAX below */
  67 @@ -2627,17 +2593,8 @@ enum nl80211_commands {
  68   * @NL80211_ATTR_COLOR_CHANGE_ELEMS: Nested set of attributes containing the IE
  69   *     information for the time while performing a color switch.
  70   *
  71 - * @NL80211_ATTR_MBSSID_CONFIG: Nested attribute for multiple BSSID
  72 - *     advertisements (MBSSID) parameters in AP mode.
  73 - *     Kernel uses this attribute to indicate the driver's support for MBSSID
  74 - *     and enhanced multi-BSSID advertisements (EMA AP) to the userspace.
  75 - *     Userspace should use this attribute to configure per interface MBSSID
  76 - *     parameters.
  77 - *     See &enum nl80211_mbssid_config_attributes for details.
  78 - *
  79 - * @NL80211_ATTR_MBSSID_ELEMS: Nested parameter to pass multiple BSSID elements.
  80 - *     Mandatory parameter for the transmitting interface to enable MBSSID.
  81 - *     Optional for the non-transmitting interfaces.
  82 + * @NL80211_ATTR_WIPHY_ANTENNA_GAIN: Configured antenna gain. Used to reduce
  83 + *     transmit power to stay within regulatory limits. u32, dBi.
  84   *
  85   * @NUM_NL80211_ATTR: total number of nl80211_attrs available
  86   * @NL80211_ATTR_MAX: highest attribute number currently defined
  87 @@ -3142,8 +3099,7 @@ enum nl80211_attrs {
  88         NL80211_ATTR_COLOR_CHANGE_COLOR,
  89         NL80211_ATTR_COLOR_CHANGE_ELEMS,
  90
  91 -       NL80211_ATTR_MBSSID_CONFIG,
  92 -       NL80211_ATTR_MBSSID_ELEMS,
  93 +       NL80211_ATTR_WIPHY_ANTENNA_GAIN,
  94
  95         /* add attributes here, update the policy in nl80211.c */
  96
  97 @@ -4978,7 +4934,6 @@ enum nl80211_txrate_gi {
  98   * @NL80211_BAND_60GHZ: around 60 GHz band (58.32 - 69.12 GHz)
  99   * @NL80211_BAND_6GHZ: around 6 GHz band (5.9 - 7.2 GHz)
 100   * @NL80211_BAND_S1GHZ: around 900MHz, supported by S1G PHYs
 101 - * @NL80211_BAND_LC: light communication band (placeholder)
 102   * @NUM_NL80211_BANDS: number of bands, avoid using this in userspace
 103   *     since newer kernel versions may support more bands
 104   */
 105 @@ -4988,7 +4943,6 @@ enum nl80211_band {
 106         NL80211_BAND_60GHZ,
 107         NL80211_BAND_6GHZ,
 108         NL80211_BAND_S1GHZ,
 109 -       NL80211_BAND_LC,
 110
 111         NUM_NL80211_BANDS,
 112  };
 113 @@ -6046,11 +6000,6 @@ enum nl80211_feature_flags {
 114   * @NL80211_EXT_FEATURE_BSS_COLOR: The driver supports BSS color collision
 115   *     detection and change announcemnts.
 116   *
 117 - * @NL80211_EXT_FEATURE_FILS_CRYPTO_OFFLOAD: Driver running in AP mode supports
 118 - *     FILS encryption and decryption for (Re)Association Request and Response
 119 - *     frames. Userspace has to share FILS AAD details to the driver by using
 120 - *     @NL80211_CMD_SET_FILS_AAD.
 121 - *
 122   * @NUM_NL80211_EXT_FEATURES: number of extended features.
 123   * @MAX_NL80211_EXT_FEATURES: highest extended feature index.
 124   */
 125 @@ -6116,7 +6065,6 @@ enum nl80211_ext_feature_index {
 126         NL80211_EXT_FEATURE_SECURE_RTT,
 127         NL80211_EXT_FEATURE_PROT_RANGE_NEGO_AND_MEASURE,
 128         NL80211_EXT_FEATURE_BSS_COLOR,
 129 -       NL80211_EXT_FEATURE_FILS_CRYPTO_OFFLOAD,
 130
 131         /* add new features before the definition below */
 132         NUM_NL80211_EXT_FEATURES,
 133 @@ -7406,60 +7354,4 @@ enum nl80211_sar_specs_attrs {
 134         NL80211_SAR_ATTR_SPECS_MAX = __NL80211_SAR_ATTR_SPECS_LAST - 1,
 135  };
 136
 137 -/**
 138 - * enum nl80211_mbssid_config_attributes - multiple BSSID (MBSSID) and enhanced
 139 - * multi-BSSID advertisements (EMA) in AP mode.
 140 - * Kernel uses some of these attributes to advertise driver's support for
 141 - * MBSSID and EMA.
 142 - * Remaining attributes should be used by the userspace to configure the
 143 - * features.
 144 - *
 145 - * @__NL80211_MBSSID_CONFIG_ATTR_INVALID: Invalid
 146 - *
 147 - * @NL80211_MBSSID_CONFIG_ATTR_MAX_INTERFACES: Used by the kernel to advertise
 148 - *     the maximum number of MBSSID interfaces supported by the driver.
 149 - *     Driver should indicate MBSSID support by setting
 150 - *     wiphy->mbssid_max_interfaces to a value more than or equal to 2.
 151 - *
 152 - * @NL80211_MBSSID_CONFIG_ATTR_MAX_EMA_PROFILE_PERIODICITY: Used by the kernel
 153 - *     to advertise the maximum profile periodicity supported by the driver
 154 - *     if EMA is enabled. Driver should indicate EMA support to the userspace
 155 - *     by setting wiphy->ema_max_profile_periodicity to
 156 - *     a non-zero value.
 157 - *
 158 - * @NL80211_MBSSID_CONFIG_ATTR_INDEX: Mandatory parameter to pass the index of
 159 - *     this BSS (u8) in the multiple BSSID set.
 160 - *     Value must be set to 0 for the transmitting interface and non-zero for
 161 - *     all non-transmitting interfaces. The userspace will be responsible
 162 - *     for using unique indices for the interfaces.
 163 - *     Range: 0 to wiphy->mbssid_max_interfaces-1.
 164 - *
 165 - * @NL80211_MBSSID_CONFIG_ATTR_TX_IFINDEX: Mandatory parameter for
 166 - *     a non-transmitted profile which provides the interface index (u32) of
 167 - *     the transmitted profile. The value must match one of the interface
 168 - *     indices advertised by the kernel. Optional if the interface being set up
 169 - *     is the transmitting one, however, if provided then the value must match
 170 - *     the interface index of the same.
 171 - *
 172 - * @NL80211_MBSSID_CONFIG_ATTR_EMA: Flag used to enable EMA AP feature.
 173 - *     Setting this flag is permitted only if the driver advertises EMA support
 174 - *     by setting wiphy->ema_max_profile_periodicity to non-zero.
 175 - *
 176 - * @__NL80211_MBSSID_CONFIG_ATTR_LAST: Internal
 177 - * @NL80211_MBSSID_CONFIG_ATTR_MAX: highest attribute
 178 - */
 179 -enum nl80211_mbssid_config_attributes {
 180 -       __NL80211_MBSSID_CONFIG_ATTR_INVALID,
 181 -
 182 -       NL80211_MBSSID_CONFIG_ATTR_MAX_INTERFACES,
 183 -       NL80211_MBSSID_CONFIG_ATTR_MAX_EMA_PROFILE_PERIODICITY,
 184 -       NL80211_MBSSID_CONFIG_ATTR_INDEX,
 185 -       NL80211_MBSSID_CONFIG_ATTR_TX_IFINDEX,
 186 -       NL80211_MBSSID_CONFIG_ATTR_EMA,
 187 -
 188 -       /* keep last */
 189 -       __NL80211_MBSSID_CONFIG_ATTR_LAST,
 190 -       NL80211_MBSSID_CONFIG_ATTR_MAX = __NL80211_MBSSID_CONFIG_ATTR_LAST - 1,
 191 -};
 192 -
 193  #endif /* __LINUX_NL80211_H */
 194 --- a/info.c
 195 +++ b/info.c
 196 @@ -701,7 +701,6 @@ broken_combination:
 197                 ext_feat_print(tb, OPERATING_CHANNEL_VALIDATION, "Operating Channel Validation (OCV) support");
 198                 ext_feat_print(tb, 4WAY_HANDSHAKE_AP_PSK, "AP mode PSK offload support");
 199                 ext_feat_print(tb, BSS_COLOR, "BSS coloring support");
 200 -               ext_feat_print(tb, FILS_CRYPTO_OFFLOAD, "FILS crypto offload");
 201         }
 202
 203         if (tb_msg[NL80211_ATTR_COALESCE_RULE]) {