odhcpd: update to git HEAD version (FS#397) (FS#481)

[openwrt/staging/yousong.git] / package / network / utils / iw / patches / 001-nl80211_h_sync.patch

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 e025a67310bc0be1de347583330cd7aeef1b1bda..5d98281eaefa7c220038d1aacd70890ac246e353 100644 (file)
--- a/package/network/utils/iw/patches/001-nl80211_h_sync.patch
+++ b/package/network/utils/iw/patches/001-nl80211_h_sync.patch
@@ -1,40 +1,21 @@
 --- a/nl80211.h
 +++ b/nl80211.h
-@@ -1724,8 +1724,7 @@ enum nl80211_attrs {
-       NL80211_ATTR_MDID,
-       NL80211_ATTR_IE_RIC,
+@@ -1937,6 +1937,9 @@ enum nl80211_commands {
+  * @NL80211_ATTR_NAN_MATCH: used to report a match. This is a nested attribute.
+  *    See &enum nl80211_nan_match_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
+@@ -2336,6 +2339,8 @@ enum nl80211_attrs {
+       NL80211_ATTR_NAN_FUNC,
+       NL80211_ATTR_NAN_MATCH,
  
--      NL80211_ATTR_CRIT_PROT_ID,
--      NL80211_ATTR_MAX_CRIT_PROT_DURATION,
 +      NL80211_ATTR_WIPHY_ANTENNA_GAIN,
- 
++
        /* add attributes here, update the policy in nl80211.c */
  
-@@ -1991,6 +1990,10 @@ enum nl80211_sta_bss_param {
-  * @NL80211_STA_INFO_PEER_PM: peer mesh STA link-specific power mode
-  * @NL80211_STA_INFO_NONPEER_PM: neighbor mesh STA power save mode towards
-  *    non-peer STA
-+ * @NL80211_STA_INFO_CHAIN_SIGNAL: per-chain signal strength of last PPDU
-+ *    Contains a nested array of signal strength attributes (u8, dBm)
-+ * @NL80211_STA_INFO_CHAIN_SIGNAL_AVG: per-chain signal strength average
-+ *    Same format as NL80211_STA_INFO_CHAIN_SIGNAL.
-  * @__NL80211_STA_INFO_AFTER_LAST: internal
-  * @NL80211_STA_INFO_MAX: highest possible station info attribute
-  */
-@@ -2020,6 +2023,8 @@ enum nl80211_sta_info {
-       NL80211_STA_INFO_NONPEER_PM,
-       NL80211_STA_INFO_RX_BYTES64,
-       NL80211_STA_INFO_TX_BYTES64,
-+      NL80211_STA_INFO_CHAIN_SIGNAL,
-+      NL80211_STA_INFO_CHAIN_SIGNAL_AVG,
- 
-       /* keep last */
-       __NL80211_STA_INFO_AFTER_LAST,
-@@ -2424,6 +2429,7 @@ enum nl80211_mntr_flags {
-       NL80211_MNTR_FLAG_CONTROL,
-       NL80211_MNTR_FLAG_OTHER_BSS,
-       NL80211_MNTR_FLAG_COOK_FRAMES,
-+      NL80211_MNTR_FLAG_ACTIVE,
- 
-       /* keep last */
-       __NL80211_MNTR_FLAG_AFTER_LAST,
+       __NL80211_ATTR_AFTER_LAST,