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 @@ -1226,12 +1203,6 @@
  34   * @NL80211_CMD_COLOR_CHANGE_COMPLETED: Notify userland that the color change
  35   *     has completed
  36   *
  37 - * @NL80211_CMD_SET_FILS_AAD: Set FILS AAD data to the driver using -
  38 - *     &NL80211_ATTR_MAC - for STA MAC address
  39 - *     &NL80211_ATTR_FILS_KEK - for KEK
  40 - *     &NL80211_ATTR_FILS_NONCES - for FILS Nonces
  41 - *             (STA Nonce 16 bytes followed by AP Nonce 16 bytes)
  42 - *
  43   * @NL80211_CMD_MAX: highest used command number
  44   * @__NL80211_CMD_AFTER_LAST: internal use
  45   */
  46 @@ -1472,8 +1443,6 @@ enum nl80211_commands {
  47         NL80211_CMD_COLOR_CHANGE_ABORTED,
  48         NL80211_CMD_COLOR_CHANGE_COMPLETED,
  49
  50 -       NL80211_CMD_SET_FILS_AAD,
  51 -
  52         /* add new commands above here */
  53
  54         /* used to define NL80211_CMD_MAX below */
  55 @@ -2639,6 +2608,9 @@ enum nl80211_commands {
  56   *     Mandatory parameter for the transmitting interface to enable MBSSID.
  57   *     Optional for the non-transmitting interfaces.
  58   *
  59 + * @NL80211_ATTR_WIPHY_ANTENNA_GAIN: Configured antenna gain. Used to reduce
  60 + *     transmit power to stay within regulatory limits. u32, dBi.
  61 + *
  62   * @NUM_NL80211_ATTR: total number of nl80211_attrs available
  63   * @NL80211_ATTR_MAX: highest attribute number currently defined
  64   * @__NL80211_ATTR_AFTER_LAST: internal use
  65 @@ -3145,6 +3117,8 @@ enum nl80211_attrs {
  66         NL80211_ATTR_MBSSID_CONFIG,
  67         NL80211_ATTR_MBSSID_ELEMS,
  68
  69 +       NL80211_ATTR_WIPHY_ANTENNA_GAIN,
  70 +
  71         /* add attributes here, update the policy in nl80211.c */
  72
  73         __NL80211_ATTR_AFTER_LAST,
  74 @@ -4978,7 +4952,6 @@ enum nl80211_txrate_gi {
  75   * @NL80211_BAND_60GHZ: around 60 GHz band (58.32 - 69.12 GHz)
  76   * @NL80211_BAND_6GHZ: around 6 GHz band (5.9 - 7.2 GHz)
  77   * @NL80211_BAND_S1GHZ: around 900MHz, supported by S1G PHYs
  78 - * @NL80211_BAND_LC: light communication band (placeholder)
  79   * @NUM_NL80211_BANDS: number of bands, avoid using this in userspace
  80   *     since newer kernel versions may support more bands
  81   */
  82 @@ -4988,7 +4961,6 @@ enum nl80211_band {
  83         NL80211_BAND_60GHZ,
  84         NL80211_BAND_6GHZ,
  85         NL80211_BAND_S1GHZ,
  86 -       NL80211_BAND_LC,
  87
  88         NUM_NL80211_BANDS,
  89  };
  90 @@ -6046,11 +6018,6 @@ enum nl80211_feature_flags {
  91   * @NL80211_EXT_FEATURE_BSS_COLOR: The driver supports BSS color collision
  92   *     detection and change announcemnts.
  93   *
  94 - * @NL80211_EXT_FEATURE_FILS_CRYPTO_OFFLOAD: Driver running in AP mode supports
  95 - *     FILS encryption and decryption for (Re)Association Request and Response
  96 - *     frames. Userspace has to share FILS AAD details to the driver by using
  97 - *     @NL80211_CMD_SET_FILS_AAD.
  98 - *
  99   * @NUM_NL80211_EXT_FEATURES: number of extended features.
 100   * @MAX_NL80211_EXT_FEATURES: highest extended feature index.
 101   */
 102 @@ -6116,7 +6083,6 @@ enum nl80211_ext_feature_index {
 103         NL80211_EXT_FEATURE_SECURE_RTT,
 104         NL80211_EXT_FEATURE_PROT_RANGE_NEGO_AND_MEASURE,
 105         NL80211_EXT_FEATURE_BSS_COLOR,
 106 -       NL80211_EXT_FEATURE_FILS_CRYPTO_OFFLOAD,
 107
 108         /* add new features before the definition below */
 109         NUM_NL80211_EXT_FEATURES,
 110 @@ -7424,7 +7390,7 @@ enum nl80211_sar_specs_attrs {
 111   * @NL80211_MBSSID_CONFIG_ATTR_MAX_EMA_PROFILE_PERIODICITY: Used by the kernel
 112   *     to advertise the maximum profile periodicity supported by the driver
 113   *     if EMA is enabled. Driver should indicate EMA support to the userspace
 114 - *     by setting wiphy->ema_max_profile_periodicity to
 115 + *     by setting wiphy->mbssid_max_ema_profile_periodicity to
 116   *     a non-zero value.
 117   *
 118   * @NL80211_MBSSID_CONFIG_ATTR_INDEX: Mandatory parameter to pass the index of
 119 @@ -7443,7 +7409,7 @@ enum nl80211_sar_specs_attrs {
 120   *
 121   * @NL80211_MBSSID_CONFIG_ATTR_EMA: Flag used to enable EMA AP feature.
 122   *     Setting this flag is permitted only if the driver advertises EMA support
 123 - *     by setting wiphy->ema_max_profile_periodicity to non-zero.
 124 + *     by setting wiphy->mbssid_max_ema_profile_periodicity to non-zero.
 125   *
 126   * @__NL80211_MBSSID_CONFIG_ATTR_LAST: Internal
 127   * @NL80211_MBSSID_CONFIG_ATTR_MAX: highest attribute
 128 --- a/info.c
 129 +++ b/info.c
 130 @@ -701,7 +701,6 @@ broken_combination:
 131                 ext_feat_print(tb, OPERATING_CHANNEL_VALIDATION, "Operating Channel Validation (OCV) support");
 132                 ext_feat_print(tb, 4WAY_HANDSHAKE_AP_PSK, "AP mode PSK offload support");
 133                 ext_feat_print(tb, BSS_COLOR, "BSS coloring support");
 134 -               ext_feat_print(tb, FILS_CRYPTO_OFFLOAD, "FILS crypto offload");
 135         }
 136
 137         if (tb_msg[NL80211_ATTR_COALESCE_RULE]) {