Johannes Berg says: ==================== Another set of changes, this time with: * lots more S1G band support * 6 GHz scanning, finally * kernel-doc fixes * non-split wiphy dump fixes in nl80211 * various other small cleanups/features ====================
Showing the changes to include/uapi/linux (1 of 27 files). Show all
Unified · Split
| @@ -2521,6 +2521,12 @@ enum nl80211_commands { · 2520 unmodified lines | ||
| 2521 | 2521 | * unsolicited broadcast probe response. It is a nested attribute, see |
| 2522 | 2522 | * &enum nl80211_unsol_bcast_probe_resp_attributes. |
| 2523 | 2523 | * |
| 2524 | + * @NL80211_ATTR_S1G_CAPABILITY: S1G Capability information element (from | |
| 2525 | + * association request when used with NL80211_CMD_NEW_STATION) | |
| 2526 | + * @NL80211_ATTR_S1G_CAPABILITY_MASK: S1G Capability Information element | |
| 2527 | + * override mask. Used with NL80211_ATTR_S1G_CAPABILITY in | |
| 2528 | + * NL80211_CMD_ASSOCIATE or NL80211_CMD_CONNECT. | |
| 2529 | + * | |
| 2524 | 2530 | * @NUM_NL80211_ATTR: total number of nl80211_attrs available |
| 2525 | 2531 | * @NL80211_ATTR_MAX: highest attribute number currently defined |
| 2526 | 2532 | * @__NL80211_ATTR_AFTER_LAST: internal use |
| @@ -3007,6 +3013,9 @@ enum nl80211_attrs { · 480 unmodified lines | ||
| 3007 | 3013 | |
| 3008 | 3014 | NL80211_ATTR_UNSOL_BCAST_PROBE_RESP, |
| 3009 | 3015 | |
| 3016 | + NL80211_ATTR_S1G_CAPABILITY, | |
| 3017 | + NL80211_ATTR_S1G_CAPABILITY_MASK, | |
| 3018 | + | |
| 3010 | 3019 | /* add attributes here, update the policy in nl80211.c */ |
| 3011 | 3020 | |
| 3012 | 3021 | __NL80211_ATTR_AFTER_LAST, |
| @@ -4088,6 +4097,7 @@ enum nl80211_user_reg_hint_type { · 1075 unmodified lines | ||
| 4088 | 4097 | * receiving frames destined to the local BSS |
| 4089 | 4098 | * @NL80211_SURVEY_INFO_MAX: highest survey info attribute number |
| 4090 | 4099 | * currently defined |
| 4100 | + * @NL80211_SURVEY_INFO_FREQUENCY_OFFSET: center frequency offset in KHz | |
| 4091 | 4101 | * @__NL80211_SURVEY_INFO_AFTER_LAST: internal use |
| 4092 | 4102 | */ |
| 4093 | 4103 | enum nl80211_survey_info { |
| @@ -4103,6 +4113,7 @@ enum nl80211_survey_info { · 9 unmodified lines | ||
| 4103 | 4113 | NL80211_SURVEY_INFO_TIME_SCAN, |
| 4104 | 4114 | NL80211_SURVEY_INFO_PAD, |
| 4105 | 4115 | NL80211_SURVEY_INFO_TIME_BSS_RX, |
| 4116 | + NL80211_SURVEY_INFO_FREQUENCY_OFFSET, | |
| 4106 | 4117 | |
| 4107 | 4118 | /* keep last */ |
| 4108 | 4119 | __NL80211_SURVEY_INFO_AFTER_LAST, |
| @@ -6059,6 +6070,8 @@ enum nl80211_timeout_reason { · 1950 unmodified lines | ||
| 6059 | 6070 | * @NL80211_SCAN_FLAG_FREQ_KHZ: report scan results with |
| 6060 | 6071 | * %NL80211_ATTR_SCAN_FREQ_KHZ. This also means |
| 6061 | 6072 | * %NL80211_ATTR_SCAN_FREQUENCIES will not be included. |
| 6073 | + * @NL80211_SCAN_FLAG_COLOCATED_6GHZ: scan for colocated APs reported by | |
| 6074 | + * 2.4/5 GHz APs | |
| 6062 | 6075 | */ |
| 6063 | 6076 | enum nl80211_scan_flags { |
| 6064 | 6077 | NL80211_SCAN_FLAG_LOW_PRIORITY = 1<<0, |
| @@ -6075,6 +6088,7 @@ enum nl80211_scan_flags { · 10 unmodified lines | ||
| 6075 | 6088 | NL80211_SCAN_FLAG_RANDOM_SN = 1<<11, |
| 6076 | 6089 | NL80211_SCAN_FLAG_MIN_PREQ_CONTENT = 1<<12, |
| 6077 | 6090 | NL80211_SCAN_FLAG_FREQ_KHZ = 1<<13, |
| 6091 | + NL80211_SCAN_FLAG_COLOCATED_6GHZ = 1<<14, | |
| 6078 | 6092 | }; |
| 6079 | 6093 | |
| 6080 | 6094 | /** |
| @@ -6977,6 +6991,13 @@ enum nl80211_peer_measurement_ftm_resp { · 896 unmodified lines | ||
| 6977 | 6991 | * |
| 6978 | 6992 | * @NL80211_HE_OBSS_PD_ATTR_MIN_OFFSET: the OBSS PD minimum tx power offset. |
| 6979 | 6993 | * @NL80211_HE_OBSS_PD_ATTR_MAX_OFFSET: the OBSS PD maximum tx power offset. |
| 6994 | + * @NL80211_HE_OBSS_PD_ATTR_NON_SRG_MAX_OFFSET: the non-SRG OBSS PD maximum | |
| 6995 | + * tx power offset. | |
| 6996 | + * @NL80211_HE_OBSS_PD_ATTR_BSS_COLOR_BITMAP: bitmap that indicates the BSS color | |
| 6997 | + * values used by members of the SRG. | |
| 6998 | + * @NL80211_HE_OBSS_PD_ATTR_PARTIAL_BSSID_BITMAP: bitmap that indicates the partial | |
| 6999 | + * BSSID values used by members of the SRG. | |
| 7000 | + * @NL80211_HE_OBSS_PD_ATTR_SR_CTRL: The SR Control field of SRP element. | |
| 6980 | 7001 | * |
| 6981 | 7002 | * @__NL80211_HE_OBSS_PD_ATTR_LAST: Internal |
| 6982 | 7003 | * @NL80211_HE_OBSS_PD_ATTR_MAX: highest OBSS PD attribute. |
| @@ -6986,6 +7007,10 @@ enum nl80211_obss_pd_attributes { · 3 unmodified lines | ||
| 6986 | 7007 | |
| 6987 | 7008 | NL80211_HE_OBSS_PD_ATTR_MIN_OFFSET, |
| 6988 | 7009 | NL80211_HE_OBSS_PD_ATTR_MAX_OFFSET, |
| 7010 | + NL80211_HE_OBSS_PD_ATTR_NON_SRG_MAX_OFFSET, | |
| 7011 | + NL80211_HE_OBSS_PD_ATTR_BSS_COLOR_BITMAP, | |
| 7012 | + NL80211_HE_OBSS_PD_ATTR_PARTIAL_BSSID_BITMAP, | |
| 7013 | + NL80211_HE_OBSS_PD_ATTR_SR_CTRL, | |
| 6989 | 7014 | |
| 6990 | 7015 | /* keep last */ |
| 6991 | 7016 | __NL80211_HE_OBSS_PD_ATTR_LAST, |