bd2cb59b723020ca22a42ecb92b63f954a76993e
[oweals/openwrt.git] / package / network / utils / iw / patches / 001-nl80211_h_sync.patch
1 --- a/nl80211.h
2 +++ b/nl80211.h
3 @@ -657,9 +657,7 @@
4   *     is used during CSA period.
5   * @NL80211_CMD_FRAME_WAIT_CANCEL: When an off-channel TX was requested, this
6   *     command may be used with the corresponding cookie to cancel the wait
7 - *     time if it is known that it is no longer necessary.  This command is
8 - *     also sent as an event whenever the driver has completed the off-channel
9 - *     wait time.
10 + *     time if it is known that it is no longer necessary.
11   * @NL80211_CMD_ACTION: Alias for @NL80211_CMD_FRAME for backward compatibility.
12   * @NL80211_CMD_FRAME_TX_STATUS: Report TX status of a management frame
13   *     transmitted with %NL80211_CMD_FRAME. %NL80211_ATTR_COOKIE identifies
14 @@ -2358,8 +2356,8 @@ enum nl80211_commands {
15   *
16   * @NL80211_ATTR_TWT_RESPONDER: Enable target wait time responder support.
17   *
18 - * @NL80211_ATTR_HE_OBSS_PD: nested attribute for OBSS Packet Detection
19 - *     functionality.
20 + * @NL80211_ATTR_WIPHY_ANTENNA_GAIN: Configured antenna gain. Used to reduce
21 + *     transmit power to stay within regulatory limits. u32, dBi.
22   *
23   * @NUM_NL80211_ATTR: total number of nl80211_attrs available
24   * @NL80211_ATTR_MAX: highest attribute number currently defined
25 @@ -2818,7 +2816,7 @@ enum nl80211_attrs {
26  
27         NL80211_ATTR_TWT_RESPONDER,
28  
29 -       NL80211_ATTR_HE_OBSS_PD,
30 +       NL80211_ATTR_WIPHY_ANTENNA_GAIN,
31  
32         /* add attributes here, update the policy in nl80211.c */
33  
34 @@ -3843,6 +3841,8 @@ enum nl80211_user_reg_hint_type {
35   * @NL80211_SURVEY_INFO_TIME_SCAN: time the radio spent for scan
36   *     (on this channel or globally)
37   * @NL80211_SURVEY_INFO_PAD: attribute used for padding for 64-bit alignment
38 + * @NL80211_SURVEY_INFO_TIME_BSS_RX: amount of time the radio spent
39 + *     receiving local BSS data
40   * @NL80211_SURVEY_INFO_MAX: highest survey info attribute number
41   *     currently defined
42   * @__NL80211_SURVEY_INFO_AFTER_LAST: internal use
43 @@ -3859,6 +3859,7 @@ enum nl80211_survey_info {
44         NL80211_SURVEY_INFO_TIME_TX,
45         NL80211_SURVEY_INFO_TIME_SCAN,
46         NL80211_SURVEY_INFO_PAD,
47 +       NL80211_SURVEY_INFO_TIME_BSS_RX,
48  
49         /* keep last */
50         __NL80211_SURVEY_INFO_AFTER_LAST,
51 @@ -6495,26 +6496,4 @@ enum nl80211_peer_measurement_ftm_resp {
52         NL80211_PMSR_FTM_RESP_ATTR_MAX = NUM_NL80211_PMSR_FTM_RESP_ATTR - 1
53  };
54  
55 -/**
56 - * enum nl80211_obss_pd_attributes - OBSS packet detection attributes
57 - * @__NL80211_HE_OBSS_PD_ATTR_INVALID: Invalid
58 - *
59 - * @NL80211_HE_OBSS_PD_ATTR_MIN_OFFSET: the OBSS PD minimum tx power offset.
60 - * @NL80211_HE_OBSS_PD_ATTR_MAX_OFFSET: the OBSS PD maximum tx power offset.
61 - *
62 - * @__NL80211_HE_OBSS_PD_ATTR_LAST: Internal
63 - * @NL80211_HE_OBSS_PD_ATTR_MAX: highest OBSS PD attribute.
64 - */
65 -enum nl80211_obss_pd_attributes {
66 -       __NL80211_HE_OBSS_PD_ATTR_INVALID,
67 -
68 -       NL80211_HE_OBSS_PD_ATTR_MIN_OFFSET,
69 -       NL80211_HE_OBSS_PD_ATTR_MAX_OFFSET,
70 -
71 -       /* keep last */
72 -       __NL80211_HE_OBSS_PD_ATTR_LAST,
73 -       NL80211_HE_OBSS_PD_ATTR_MAX = __NL80211_HE_OBSS_PD_ATTR_LAST - 1,
74 -};
75 -
76 -
77  #endif /* __LINUX_NL80211_H */