blob: 3184e8384126c69e02da36a247c83d8705e14a4d [file] [log] [blame]
developerce9e5092022-11-10 22:41:59 +08001diff --git a/package/kernel/mac80211/Makefile b/package/kernel/mac80211/Makefile
developer39a1e782023-10-27 17:44:18 +08002index c9e2a37..3cac683 100644
developerce9e5092022-11-10 22:41:59 +08003--- a/package/kernel/mac80211/Makefile
4+++ b/package/kernel/mac80211/Makefile
developerad1f3172023-05-02 11:10:08 +08005@@ -20,6 +20,7 @@ PKG_SOURCE:=backports-$(PKG_VERSION).tar.xz
developerce9e5092022-11-10 22:41:59 +08006 PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/backports-$(PKG_VERSION)
7 PKG_BUILD_PARALLEL:=1
developer356ecec2022-11-14 10:25:04 +08008
developerce9e5092022-11-10 22:41:59 +08009+SOURCE_PATH:=./src
10 PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
developer356ecec2022-11-14 10:25:04 +080011
developerce9e5092022-11-10 22:41:59 +080012 PKG_DRIVERS = \
developerad1f3172023-05-02 11:10:08 +080013@@ -72,6 +73,10 @@ config-y:= \
developer6ec8e342022-11-21 18:47:15 +080014 WLAN_VENDOR_ST \
15 WLAN_VENDOR_TI \
16 WLAN_VENDOR_ZYDAS \
17+ MAC80211_DEBUG_MENU \
18+ MAC80211_MLME_DEBUG \
19+ MAC80211_STA_DEBUG \
20+ MAC80211_HT_DEBUG \
21
22 config-$(call config_package,cfg80211) += CFG80211
23 config-$(CONFIG_PACKAGE_CFG80211_TESTMODE) += NL80211_TESTMODE
developerafe1b5b2023-10-19 07:11:26 +080024@@ -297,6 +302,7 @@ define Build/Prepare
developer356ecec2022-11-14 10:25:04 +080025 mkdir -p $(PKG_BUILD_DIR)
26 $(PKG_UNPACK)
27 $(Build/Patch)
developerafe1b5b2023-10-19 07:11:26 +080028+ $(CP) $(SOURCE_PATH)/* $(PKG_BUILD_DIR) 2>/dev/null || :
developer356ecec2022-11-14 10:25:04 +080029 rm -rf \
30 $(PKG_BUILD_DIR)/include/linux/ssb \
31 $(PKG_BUILD_DIR)/include/linux/bcma \
developer20d67712022-03-02 14:09:32 +080032diff --git a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
developer39a1e782023-10-27 17:44:18 +080033index 8606093..220621c 100644
developer20d67712022-03-02 14:09:32 +080034--- a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
35+++ b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
developer37215362023-09-15 14:16:34 +080036@@ -25,10 +25,12 @@ drv_mac80211_init_device_config() {
developer0ba09b62023-03-10 18:43:49 +080037 config_add_string path phy 'macaddr:macaddr'
38 config_add_string tx_burst
developer0ba09b62023-03-10 18:43:49 +080039 config_add_string distance
developer93607dd2023-08-30 04:53:00 +080040+ config_add_int mbssid mu_onoff sr_enable sr_enhanced rnr obss_interval
developer0ba09b62023-03-10 18:43:49 +080041 config_add_int beacon_int chanbw frag rts
developer93607dd2023-08-30 04:53:00 +080042 config_add_int rxantenna txantenna txpower min_tx_power
developer37215362023-09-15 14:16:34 +080043 config_add_int num_global_macaddr multiple_bssid
44 config_add_boolean noscan ht_coex acs_exclude_dfs background_radar
developer75c99f42023-09-04 11:28:21 +080045+ config_add_boolean noscan ht_coex acs_exclude_dfs background_radar background_cert_mode
46 config_add_array ht_capab
47 config_add_array channels
48 config_add_array scan_list
developer37215362023-09-15 14:16:34 +080049@@ -51,7 +53,10 @@ drv_mac80211_init_device_config() {
developer785b6502023-04-19 18:31:11 +080050 he_spr_sr_control \
51 he_spr_psr_enabled \
52 he_bss_color_enabled \
53- he_twt_required
54+ he_twt_required \
55+ he_twt_responder \
56+ etxbfen \
57+ itxbfen
58 config_add_int \
59 beamformer_antennas \
60 beamformee_antennas \
developer37215362023-09-15 14:16:34 +080061@@ -138,13 +143,11 @@ mac80211_hostapd_setup_base() {
developer0ba09b62023-03-10 18:43:49 +080062 [ -n "$acs_exclude_dfs" ] && [ "$acs_exclude_dfs" -gt 0 ] &&
63 append base_cfg "acs_exclude_dfs=1" "$N"
64
65- json_get_vars noscan ht_coex min_tx_power:0 tx_burst
developer93607dd2023-08-30 04:53:00 +080066+ json_get_vars noscan ht_coex min_tx_power:0 tx_burst mbssid mu_onoff rnr obss_interval
developer2c4f7e82023-05-11 19:56:55 +080067+ json_get_vars etxbfen:1 itxbfen:0
developer8d77be32022-10-20 15:08:25 +080068 json_get_values ht_capab_list ht_capab
developer20d67712022-03-02 14:09:32 +080069 json_get_values channel_list channels
70
71- [ "$auto_channel" = 0 ] && [ -z "$channel_list" ] && \
72- channel_list="$channel"
73-
developer9b3248d2022-07-06 00:44:05 +080074 [ "$min_tx_power" -gt 0 ] && append base_cfg "min_tx_power=$min_tx_power"
developer20d67712022-03-02 14:09:32 +080075
developer9b3248d2022-07-06 00:44:05 +080076 set_default noscan 0
developerda1bac72023-09-19 10:32:47 +080077@@ -158,21 +161,42 @@ mac80211_hostapd_setup_base() {
developer785b6502023-04-19 18:31:11 +080078 ieee80211n=1
79 ht_capab=
80 case "$htmode" in
81- VHT20|HT20|HE20) ;;
82- HT40*|VHT40|VHT80|VHT160|HE40|HE80|HE160)
83+ VHT20|HT20|HE20|EHT20) ;;
developerbe3cf972023-04-27 09:58:26 +080084+ HT40*|VHT40|VHT80|VHT160|HE40*|HE80|HE160|EHT40*|EHT80|EHT160|EHT320*)
developer785b6502023-04-19 18:31:11 +080085 case "$hwmode" in
86 a)
87 case "$(( (($channel / 4) + $chan_ofs) % 2 ))" in
developerda1bac72023-09-19 10:32:47 +080088 1) ht_capab="[HT40+]";;
89 0) ht_capab="[HT40-]";;
90 esac
91+ case "$htmode" in
92+ HT40-|HE40-|EHT40-)
93+ if [ "$auto_channel" -gt 0 ]; then
94+ ht_capab="[HT40-]"
95+ fi
96+ ;;
97+ esac
developerbe3cf972023-04-27 09:58:26 +080098 ;;
99 *)
100 case "$htmode" in
101- HT40+) ht_capab="[HT40+]";;
102- HT40-) ht_capab="[HT40-]";;
103+ HT40+|HE40+|EHT40+)
104+ if [ "$channel" -gt 9 ]; then
105+ echo "Could not set the center freq with this HT mode setting"
106+ return 1
107+ else
108+ ht_capab="[HT40+]"
109+ fi
110+ ;;
111+ HT40-|HE40-|EHT40-)
developerda1bac72023-09-19 10:32:47 +0800112+ if [ "$channel" -lt 5 -a "$auto_channel" -eq 0 ]; then
developerbe3cf972023-04-27 09:58:26 +0800113+ echo "Could not set the center freq with this HT mode setting"
114+ return 1
115+ else
116+ ht_capab="[HT40-]"
117+ fi
118+ ;;
119 *)
developerda1bac72023-09-19 10:32:47 +0800120- if [ "$channel" -lt 7 ]; then
121+ if [ "$channel" -lt 7 -o "$auto_channel" -gt 0 ]; then
developerbe3cf972023-04-27 09:58:26 +0800122 ht_capab="[HT40+]"
developerda1bac72023-09-19 10:32:47 +0800123 else
124 ht_capab="[HT40-]"
125@@ -181,7 +205,6 @@ mac80211_hostapd_setup_base() {
126 esac
127 ;;
128 esac
129- [ "$auto_channel" -gt 0 ] && ht_capab="[HT40+]"
130 ;;
131 *) ieee80211n= ;;
132 esac
133@@ -192,6 +215,11 @@ mac80211_hostapd_setup_base() {
developer93607dd2023-08-30 04:53:00 +0800134 set_default ht_coex 0
135 append base_cfg "ht_coex=$ht_coex" "$N"
136
137+ [ "$ht_coex" -eq 1 ] && {
138+ set_default obss_interval 300
139+ append base_cfg "obss_interval=$obss_interval" "$N"
140+ }
141+
142 json_get_vars \
143 ldpc:1 \
144 greenfield:0 \
developerda1bac72023-09-19 10:32:47 +0800145@@ -203,7 +231,7 @@ mac80211_hostapd_setup_base() {
developer785b6502023-04-19 18:31:11 +0800146 dsss_cck_40:1
147
148 ht_cap_mask=0
149- for cap in $(iw phy "$phy" info | grep 'Capabilities:' | cut -d: -f2); do
150+ for cap in $(iw phy "$phy" info | grep 'Capabilities: 0x' | cut -d: -f2); do
151 ht_cap_mask="$(($ht_cap_mask | $cap))"
152 done
153
developerda1bac72023-09-19 10:32:47 +0800154@@ -234,8 +262,8 @@ mac80211_hostapd_setup_base() {
developer785b6502023-04-19 18:31:11 +0800155
156 idx="$channel"
157 case "$htmode" in
158- VHT20|HE20) enable_ac=1;;
159- VHT40|HE40)
160+ VHT20|HE20|EHT20) enable_ac=1;;
161+ VHT40|HE40|EHT40)
162 case "$(( (($channel / 4) + $chan_ofs) % 2 ))" in
163 1) idx=$(($channel + 2));;
164 0) idx=$(($channel - 2));;
developerda1bac72023-09-19 10:32:47 +0800165@@ -243,7 +271,7 @@ mac80211_hostapd_setup_base() {
developer785b6502023-04-19 18:31:11 +0800166 enable_ac=1
167 vht_center_seg0=$idx
168 ;;
169- VHT80|HE80)
170+ VHT80|HE80|EHT80)
171 case "$(( (($channel / 4) + $chan_ofs) % 4 ))" in
172 1) idx=$(($channel + 6));;
173 2) idx=$(($channel + 2));;
developerda1bac72023-09-19 10:32:47 +0800174@@ -254,7 +282,7 @@ mac80211_hostapd_setup_base() {
developer785b6502023-04-19 18:31:11 +0800175 vht_oper_chwidth=1
176 vht_center_seg0=$idx
177 ;;
178- VHT160|HE160)
179+ VHT160|HE160|EHT160)
180 if [ "$band" = "6g" ]; then
181 case "$channel" in
182 1|5|9|13|17|21|25|29) idx=15;;
developer39a1e782023-10-27 17:44:18 +0800183@@ -269,23 +297,64 @@ mac80211_hostapd_setup_base() {
developeradd8de62023-05-02 16:25:52 +0800184 case "$channel" in
185 36|40|44|48|52|56|60|64) idx=50;;
186 100|104|108|112|116|120|124|128) idx=114;;
187+ 149|153|157|161|165|169|173|177) idx=163;;
188 esac
189 fi
190 enable_ac=1
developer785b6502023-04-19 18:31:11 +0800191 vht_oper_chwidth=2
192 vht_center_seg0=$idx
193 ;;
194+ EHT320*)
195+ case "$channel" in
196+ 1|5|9|13|17|21|25|29) idx=31;;
197+ 33|37|41|45|49|53|57|61| \
198+ 65|69|73|77|81|85|89|93) idx=63;;
199+ 97|101|105|109|113|117|121|125| \
200+ 129|133|137|141|145|149|153|157) idx=127;;
201+ 161|165|169|173|177|181|185|189| \
202+ 193|197|201|205|209|213|217|221) idx=191;;
203+ esac
204+ if [[ "$htmode" = "EHT320-1" && "$channel" -ge "193" ]] ||
205+ [[ "$htmode" = "EHT320-2" && "$channel" -le "29" ]]; then
206+ echo "Could not set the center freq with this EHT setting"
207+ return 1
208+ elif [[ "$htmode" = "EHT320-1" && "$channel" -ge "33" ]]; then
209+ if [ "$channel" -gt $idx ]; then
210+ idx=$(($idx + 32))
211+ else
212+ idx=$(($idx - 32))
213+ fi
214+ fi
215+ vht_oper_chwidth=2
216+ if [ "$channel" -gt $idx ]; then
217+ vht_center_seg0=$(($idx + 16))
218+ else
219+ vht_center_seg0=$(($idx - 16))
220+ fi
221+ eht_oper_chwidth=9
222+ eht_oper_centr_freq_seg0_idx=$idx
developer39a1e782023-10-27 17:44:18 +0800223+
224+ case $htmode in
225+ EHT320-1) eht_bw320_offset=1;;
226+ EHT320-2) eht_bw320_offset=2;;
227+ EHT320) eht_bw320_offset=0;;
228+ esac
developer785b6502023-04-19 18:31:11 +0800229+ ;;
230 esac
231 [ "$band" = "5g" ] && {
developer75c99f42023-09-04 11:28:21 +0800232- json_get_vars background_radar:0
233+ json_get_vars \
234+ background_radar:0 \
235+ background_cert_mode:0 \
236
237 [ "$background_radar" -eq 1 ] && append base_cfg "enable_background_radar=1" "$N"
238+ [ "$background_cert_mode" -eq 1 ] && append base_cfg "background_radar_mode=1" "$N"
239 }
developer785b6502023-04-19 18:31:11 +0800240 [ "$band" = "6g" ] && {
241 op_class=
242 case "$htmode" in
243- HE20) op_class=131;;
244- HE*) op_class=$((132 + $vht_oper_chwidth))
245+ HE20|EHT20) op_class=131;;
246+ EHT320*) op_class=137;;
247+ HE*|EHT*) op_class=$((132 + $vht_oper_chwidth))
248 esac
249 [ -n "$op_class" ] && append base_cfg "op_class=$op_class" "$N"
250 }
developer39a1e782023-10-27 17:44:18 +0800251@@ -313,7 +382,6 @@ mac80211_hostapd_setup_base() {
developer8b04dfd2022-12-07 16:29:19 +0800252 vht_link_adapt:3 \
253 vht160:2
254
255- set_default tx_burst 2.0
256 append base_cfg "ieee80211ac=1" "$N"
257 vht_cap=0
258 for cap in $(iw phy "$phy" info | awk -F "[()]" '/VHT Capabilities/ { print $2 }'); do
developer39a1e782023-10-27 17:44:18 +0800259@@ -327,6 +395,12 @@ mac80211_hostapd_setup_base() {
developer785b6502023-04-19 18:31:11 +0800260 [ "$rx_stbc" -lt "$cap_rx_stbc" ] && cap_rx_stbc="$rx_stbc"
261 vht_cap="$(( ($vht_cap & ~(0x700)) | ($cap_rx_stbc << 8) ))"
262
263+ [ "$etxbfen" -eq 0 ] && {
264+ su_beamformer=0
265+ su_beamformee=0
266+ mu_beamformer=0
267+ }
268+
269 mac80211_add_capabilities vht_capab $vht_cap \
270 RXLDPC:0x10::$rxldpc \
271 SHORT-GI-80:0x20::$short_gi_80 \
developer39a1e782023-10-27 17:44:18 +0800272@@ -408,7 +482,7 @@ mac80211_hostapd_setup_base() {
developer785b6502023-04-19 18:31:11 +0800273 # 802.11ax
274 enable_ax=0
275 case "$htmode" in
276- HE*) enable_ax=1 ;;
277+ HE*|EHT*) enable_ax=1 ;;
278 esac
279
280 if [ "$enable_ax" != "0" ]; then
developer39a1e782023-10-27 17:44:18 +0800281@@ -417,10 +491,11 @@ mac80211_hostapd_setup_base() {
developer785b6502023-04-19 18:31:11 +0800282 he_su_beamformee:1 \
283 he_mu_beamformer:1 \
284 he_twt_required:0 \
285+ he_twt_responder \
286 he_spr_sr_control:3 \
287 he_spr_psr_enabled:0 \
288 he_spr_non_srg_obss_pd_max_offset:0 \
289- he_bss_color:128 \
290+ he_bss_color \
291 he_bss_color_enabled:1
292
293 he_phy_cap=$(iw phy "$phy" info | sed -n '/HE Iftypes: AP/,$p' | awk -F "[()]" '/HE PHY Capabilities/ { print $2 }' | head -1)
developer39a1e782023-10-27 17:44:18 +0800294@@ -434,6 +509,11 @@ mac80211_hostapd_setup_base() {
developer785b6502023-04-19 18:31:11 +0800295 append base_cfg "he_oper_centr_freq_seg0_idx=$vht_center_seg0" "$N"
296 }
297
298+ [ "$etxbfen" -eq 0 ] && {
299+ he_su_beamformer=0
300+ he_mu_beamformer=0
301+ }
302+
303 mac80211_add_he_capabilities \
304 he_su_beamformer:${he_phy_cap:6:2}:0x80:$he_su_beamformer \
305 he_su_beamformee:${he_phy_cap:8:2}:0x1:$he_su_beamformee \
developer39a1e782023-10-27 17:44:18 +0800306@@ -441,7 +521,14 @@ mac80211_hostapd_setup_base() {
developer785b6502023-04-19 18:31:11 +0800307 he_spr_psr_enabled:${he_phy_cap:14:2}:0x1:$he_spr_psr_enabled \
308 he_twt_required:${he_mac_cap:0:2}:0x6:$he_twt_required
309
310+ if [ -n "$he_twt_responder" ]; then
311+ append base_cfg "he_twt_responder=$he_twt_responder" "$N"
312+ fi
313 if [ "$he_bss_color_enabled" -gt 0 ]; then
developer830efa72023-05-18 19:32:48 +0800314+ if !([ "$he_bss_color" -gt 0 ] && [ "$he_bss_color" -le 64 ]); then
developer785b6502023-04-19 18:31:11 +0800315+ rand=$(head -n 1 /dev/urandom | tr -dc 0-9 | head -c 2)
316+ he_bss_color=$((rand % 63 + 1))
317+ fi
318 append base_cfg "he_bss_color=$he_bss_color" "$N"
319 [ "$he_spr_non_srg_obss_pd_max_offset" -gt 0 ] && { \
320 append base_cfg "he_spr_non_srg_obss_pd_max_offset=$he_spr_non_srg_obss_pd_max_offset" "$N"
developer39a1e782023-10-27 17:44:18 +0800321@@ -460,34 +547,70 @@ mac80211_hostapd_setup_base() {
developer619eaa32023-08-29 13:33:51 +0800322 append base_cfg "he_mu_edca_qos_info_q_ack=0" "$N"
323 append base_cfg "he_mu_edca_qos_info_queue_request=0" "$N"
324 append base_cfg "he_mu_edca_qos_info_txop_request=0" "$N"
325- append base_cfg "he_mu_edca_ac_be_aifsn=8" "$N"
326+ append base_cfg "he_mu_edca_ac_be_aifsn=0" "$N"
327 append base_cfg "he_mu_edca_ac_be_aci=0" "$N"
328 append base_cfg "he_mu_edca_ac_be_ecwmin=9" "$N"
329 append base_cfg "he_mu_edca_ac_be_ecwmax=10" "$N"
330 append base_cfg "he_mu_edca_ac_be_timer=255" "$N"
331- append base_cfg "he_mu_edca_ac_bk_aifsn=15" "$N"
332+ append base_cfg "he_mu_edca_ac_bk_aifsn=0" "$N"
333 append base_cfg "he_mu_edca_ac_bk_aci=1" "$N"
334 append base_cfg "he_mu_edca_ac_bk_ecwmin=9" "$N"
335 append base_cfg "he_mu_edca_ac_bk_ecwmax=10" "$N"
336 append base_cfg "he_mu_edca_ac_bk_timer=255" "$N"
337 append base_cfg "he_mu_edca_ac_vi_ecwmin=5" "$N"
338 append base_cfg "he_mu_edca_ac_vi_ecwmax=7" "$N"
339- append base_cfg "he_mu_edca_ac_vi_aifsn=5" "$N"
340+ append base_cfg "he_mu_edca_ac_vi_aifsn=0" "$N"
341 append base_cfg "he_mu_edca_ac_vi_aci=2" "$N"
342 append base_cfg "he_mu_edca_ac_vi_timer=255" "$N"
343- append base_cfg "he_mu_edca_ac_vo_aifsn=5" "$N"
344+ append base_cfg "he_mu_edca_ac_vo_aifsn=0" "$N"
345 append base_cfg "he_mu_edca_ac_vo_aci=3" "$N"
346 append base_cfg "he_mu_edca_ac_vo_ecwmin=5" "$N"
347 append base_cfg "he_mu_edca_ac_vo_ecwmax=7" "$N"
developer8b04dfd2022-12-07 16:29:19 +0800348 append base_cfg "he_mu_edca_ac_vo_timer=255" "$N"
349 fi
350
developer18015ad2023-07-13 13:18:19 +0800351+ set_default tx_burst 2
developer8b04dfd2022-12-07 16:29:19 +0800352+
developer785b6502023-04-19 18:31:11 +0800353+ # 802.11be
354+ enable_be=0
355+ case "$htmode" in
356+ EHT*) enable_be=1 ;;
357+ esac
358+
359+ if [ "$enable_be" != "0" ]; then
360+ append base_cfg "ieee80211be=1" "$N"
361+ if [ "$etxbfen" -eq 0 ]; then
362+ append base_cfg "eht_su_beamformee=1" "$N"
363+ else
364+ append base_cfg "eht_su_beamformer=1" "$N"
365+ append base_cfg "eht_su_beamformee=1" "$N"
366+ append base_cfg "eht_mu_beamformer=1" "$N"
367+ fi
368+ [ "$hwmode" = "a" ] && {
369+ case $htmode in
370+ EHT320*)
371+ append base_cfg "eht_oper_chwidth=$eht_oper_chwidth" "$N"
372+ append base_cfg "eht_oper_centr_freq_seg0_idx=$eht_oper_centr_freq_seg0_idx" "$N"
developer39a1e782023-10-27 17:44:18 +0800373+ append base_cfg "eht_bw320_offset=$eht_bw320_offset" "$N"
developer785b6502023-04-19 18:31:11 +0800374+ ;;
375+ *)
376+ append base_cfg "eht_oper_chwidth=$vht_oper_chwidth" "$N"
377+ append base_cfg "eht_oper_centr_freq_seg0_idx=$vht_center_seg0" "$N"
378+ ;;
379+ esac
380+ }
381+ fi
382+
developer8b04dfd2022-12-07 16:29:19 +0800383 hostapd_prepare_device_config "$hostapd_conf_file" nl80211
384 cat >> "$hostapd_conf_file" <<EOF
385 ${channel:+channel=$channel}
developer0ba09b62023-03-10 18:43:49 +0800386 ${channel_list:+chanlist=$channel_list}
387 ${hostapd_noscan:+noscan=1}
388 ${tx_burst:+tx_queue_data2_burst=$tx_burst}
389+${mbssid:+mbssid=$mbssid}
developer785b6502023-04-19 18:31:11 +0800390+${mu_onoff:+mu_onoff=$mu_onoff}
391+${itxbfen:+ibf_enable=$itxbfen}
developer2c6592a2023-07-21 11:20:56 +0800392+${rnr:+rnr=$rnr}
developer37215362023-09-15 14:16:34 +0800393 ${multiple_bssid:+mbssid=$multiple_bssid}
394 #num_global_macaddr=$num_global_macaddr
developer0ba09b62023-03-10 18:43:49 +0800395 $base_cfg
developer39a1e782023-10-27 17:44:18 +0800396@@ -515,7 +638,7 @@ mac80211_hostapd_setup_bss() {
developer093e1a32023-02-24 16:10:53 +0800397 append hostapd_cfg "wds_sta=1" "$N"
398 [ -n "$wds_bridge" ] && append hostapd_cfg "wds_bridge=$wds_bridge" "$N"
399 }
400- [ "$staidx" -gt 0 -o "$start_disabled" -eq 1 ] && append hostapd_cfg "start_disabled=1" "$N"
401+ [ "$start_disabled" -eq 1 ] && append hostapd_cfg "start_disabled=1" "$N"
402
403 cat >> /var/run/hostapd-$phy.conf <<EOF
404 $hostapd_cfg
developer39a1e782023-10-27 17:44:18 +0800405@@ -526,6 +649,31 @@ ${max_listen_int:+max_listen_interval=$max_listen_int}
developer0ba09b62023-03-10 18:43:49 +0800406 EOF
407 }
408
409+mac80211_generate_mbssid_mac() {
410+ local phy="$1"
411+ local transmitted_bssid="$2"
developer1952bcd2023-06-20 20:14:37 +0800412+ local id="${mbssidx:-0}"
developer0ba09b62023-03-10 18:43:49 +0800413+
414+ local ref="$(cat /sys/class/ieee80211/${phy}/macaddress)"
developer0ba09b62023-03-10 18:43:49 +0800415+
416+ if [ -z "$transmitted_bssid" ]; then
417+ transmitted_bssid=$ref
418+ fi
419+
420+ if [ $id -eq 0 ]; then
421+ echo "$transmitted_bssid"
422+ return
423+ fi
424+
425+ local oIFS="$IFS"; IFS=":"; set -- $transmitted_bssid; IFS="$oIFS"
426+
427+ # Calculate nontransmitted bssid
developer0ba09b62023-03-10 18:43:49 +0800428+ b6="0x$6"
429+ ref_b6=$(($b6 % $max_mbssid))
developer1952bcd2023-06-20 20:14:37 +0800430+ b6=$(($b6 - $ref_b6 + ($ref_b6 + $id) % $max_mbssid))
developer0ba09b62023-03-10 18:43:49 +0800431+ printf "%s:%s:%s:%s:%s:%02x" $1 $2 $3 $4 $5 $b6
432+}
433+
434 mac80211_get_addr() {
435 local phy="$1"
436 local idx="$(($2 + 1))"
developer39a1e782023-10-27 17:44:18 +0800437@@ -649,7 +797,19 @@ mac80211_prepare_vif() {
developer24684862023-08-02 08:10:38 +0800438 json_add_string _ifname "$ifname"
developer0ba09b62023-03-10 18:43:49 +0800439
developer37215362023-09-15 14:16:34 +0800440 default_macaddr=
developer0ba09b62023-03-10 18:43:49 +0800441- if [ -z "$macaddr" ]; then
developerd2fbd572023-06-19 19:48:25 +0800442+ if [ "$mbssid" -gt 0 ] && [ "$mode" == "ap" ]; then
developer1952bcd2023-06-20 20:14:37 +0800443+ [ "$mbssidx" -eq 0 ] && {
444+ if [ -z $macaddr ]; then
445+ transmitted_bssid="$(mac80211_generate_mac $phy)"
446+ else
447+ # uci set mac address
448+ transmitted_bssid=$macaddr
449+ fi
450+ macidx="$(($macidx + 1))"
developer0ba09b62023-03-10 18:43:49 +0800451+ }
452+ macaddr="$(mac80211_generate_mbssid_mac $phy $transmitted_bssid)"
developer1952bcd2023-06-20 20:14:37 +0800453+ mbssidx="$(($mbssidx + 1))"
developer0ba09b62023-03-10 18:43:49 +0800454+ elif [ -z "$macaddr" ]; then
455 macaddr="$(mac80211_generate_mac $phy)"
456 macidx="$(($macidx + 1))"
developer37215362023-09-15 14:16:34 +0800457 default_macaddr=1
developer39a1e782023-10-27 17:44:18 +0800458@@ -913,6 +1073,14 @@ hostapd_set_config() {
developer24684862023-08-02 08:10:38 +0800459 }
460
461 ubus wait_for hostapd
462+
463+ # each phy sleeps different times to prevent for ubus race condition.
464+ if [ "$phy" = "phy1" ]; then
developer8169b4f2023-10-12 09:34:58 +0800465+ sleep 3;
developer24684862023-08-02 08:10:38 +0800466+ elif [ "$phy" = "phy2" ]; then
developer8169b4f2023-10-12 09:34:58 +0800467+ sleep 6;
developer24684862023-08-02 08:10:38 +0800468+ fi
469+
470 local hostapd_res="$(ubus call hostapd config_set "{ \"phy\": \"$phy\", \"config\":\"${hostapd_conf_file}\", \"prev_config\": \"${hostapd_conf_file}.prev\"}")"
471 ret="$?"
472 [ "$ret" != 0 -o -z "$hostapd_res" ] && {
developer39a1e782023-10-27 17:44:18 +0800473@@ -990,6 +1158,9 @@ mac80211_setup_vif() {
developerf0de14b2022-12-14 23:07:34 +0800474
475 json_select ..
476 [ -n "$failed" ] || wireless_add_vif "$name" "$ifname"
477+
478+ echo "Setup SMP Affinity"
479+ /sbin/smp-mt76.sh
480 }
481
482 get_freq() {
developer39a1e782023-10-27 17:44:18 +0800483@@ -1041,6 +1212,10 @@ mac80211_reset_config() {
developer37215362023-09-15 14:16:34 +0800484 wdev_tool "$phy" set_config '{}'
developer0ba09b62023-03-10 18:43:49 +0800485 }
486
487+mac80211_count_ap() {
488+ total_num_ap=$(($total_num_ap + 1))
489+}
490+
491 drv_mac80211_setup() {
492 json_select config
493 json_get_vars \
developer39a1e782023-10-27 17:44:18 +0800494@@ -1049,7 +1224,8 @@ drv_mac80211_setup() {
developer93607dd2023-08-30 04:53:00 +0800495 txpower \
developer74503112023-06-29 17:34:49 +0800496 rxantenna txantenna \
developer37215362023-09-15 14:16:34 +0800497 frag rts beacon_int:100 htmode \
498- num_global_macaddr:1 multiple_bssid
499+ num_global_macaddr:1 multiple_bssid \
developer74503112023-06-29 17:34:49 +0800500+ sr_enable sr_enhanced
501 json_get_values basic_rate_list basic_rate
502 json_get_values scan_list scan_list
503 json_select ..
developer39a1e782023-10-27 17:44:18 +0800504@@ -1084,6 +1260,7 @@ drv_mac80211_setup() {
developer24684862023-08-02 08:10:38 +0800505
developer1952bcd2023-06-20 20:14:37 +0800506 macidx=0
507 staidx=0
508+ mbssidx=0
509
510 [ -n "$chanbw" ] && {
511 for file in /sys/kernel/debug/ieee80211/$phy/ath9k*/chanbw /sys/kernel/debug/ieee80211/$phy/ath5k/bwmode; do
developer39a1e782023-10-27 17:44:18 +0800512@@ -1132,6 +1309,16 @@ drv_mac80211_setup() {
developer24684862023-08-02 08:10:38 +0800513
514 wpa_supplicant_init_config
developer0ba09b62023-03-10 18:43:49 +0800515
516+ total_num_ap=0
517+ max_mbssid=1
518+ for_each_interface "ap" mac80211_count_ap
519+ total_num_ap=$(($total_num_ap - 1))
520+ while [ $total_num_ap -gt 0 ]
521+ do
522+ total_num_ap=$(($total_num_ap >> 1))
523+ max_mbssid=$(($max_mbssid << 1))
524+ done
525+
526 mac80211_prepare_iw_htmode
developer24684862023-08-02 08:10:38 +0800527 active_ifnames=
528 for_each_interface "ap sta adhoc mesh monitor" mac80211_prepare_vif
developer39a1e782023-10-27 17:44:18 +0800529@@ -1140,6 +1327,9 @@ drv_mac80211_setup() {
developer24684862023-08-02 08:10:38 +0800530 [ -x /usr/sbin/wpa_supplicant ] && wpa_supplicant_set_config "$phy"
531 [ -x /usr/sbin/hostapd ] && hostapd_set_config "$phy"
developer74503112023-06-29 17:34:49 +0800532
533+ [ -n "$sr_enable" ] && echo "$sr_enable" > /sys/kernel/debug/ieee80211/$phy/mt76/sr_enable
534+ [ -n "$sr_enhanced" ] && echo "$sr_enhanced" > /sys/kernel/debug/ieee80211/$phy/mt76/sr_enhanced_enable
535+
developer24684862023-08-02 08:10:38 +0800536 [ -x /usr/sbin/wpa_supplicant ] && wpa_supplicant_start "$phy"
developer74503112023-06-29 17:34:49 +0800537
developer24684862023-08-02 08:10:38 +0800538 json_set_namespace wdev_uc prev
developer9b3248d2022-07-06 00:44:05 +0800539diff --git a/package/kernel/mac80211/files/lib/wifi/mac80211.sh b/package/kernel/mac80211/files/lib/wifi/mac80211.sh
developer39a1e782023-10-27 17:44:18 +0800540index e24a2a6..da3ee8c 100644
developere2597ba2022-06-24 13:09:16 +0800541--- a/package/kernel/mac80211/files/lib/wifi/mac80211.sh
542+++ b/package/kernel/mac80211/files/lib/wifi/mac80211.sh
developer20ce7bd2023-05-20 13:25:14 +0800543@@ -60,6 +60,9 @@ BEGIN {
developer785b6502023-04-19 18:31:11 +0800544 if (vht && band != "1:") mode="VHT80"
545 if (he) mode="HE80"
546 if (he && band == "1:") mode="HE20"
developer20ce7bd2023-05-20 13:25:14 +0800547+ if (eht && band == "2:") mode="EHT160"
548+ if (eht && band == "4:") mode="EHT320"
developer785b6502023-04-19 18:31:11 +0800549+ if (eht && band == "1:") mode="EHT20"
550 sub("\\[", "", channel)
551 sub("\\]", "", channel)
552 bands = bands band channel ":" mode " "
developer20ce7bd2023-05-20 13:25:14 +0800553@@ -73,6 +76,7 @@ $1 == "Band" {
developer785b6502023-04-19 18:31:11 +0800554 vht = ""
555 ht = ""
556 he = ""
557+ eht = ""
558 }
559
560 $0 ~ "Capabilities:" {
developer20ce7bd2023-05-20 13:25:14 +0800561@@ -87,6 +91,18 @@ $0 ~ "HE Iftypes" {
developer785b6502023-04-19 18:31:11 +0800562 he=1
563 }
564
565+$0 ~ "EHT Iftypes" {
566+ eht=1
567+}
568+
developer20ce7bd2023-05-20 13:25:14 +0800569+$0 ~ / *HE MAC Capabilities \(0x000000000000\)/ {
570+ he=0
571+}
572+
573+$0 ~ / *EHT MAC Capabilities \(0x0000\)/ {
574+ eht=0
575+}
576+
developer785b6502023-04-19 18:31:11 +0800577 $1 == "*" && $3 == "MHz" && $0 !~ /disabled/ && band && !channel {
578 channel = $4
579 }
developer75c99f42023-09-04 11:28:21 +0800580@@ -120,6 +136,25 @@ get_band_defaults() {
developere2597ba2022-06-24 13:09:16 +0800581 mode_band="$band"
582 channel="$chan"
583 htmode="$mode"
584+ if [ "$band" = "6g" ]
585+ then
586+ encryption=sae
587+ key=12345678
developer20ce7bd2023-05-20 13:25:14 +0800588+ sae_pwe=2
589+ ieee80211w=2
developeradbb45b2023-06-09 14:43:01 +0800590+ channel=37
591+ mbssid=1
developer75c99f42023-09-04 11:28:21 +0800592+ elif [ "$band" = "5g" ]
593+ then
594+ noscan=1
595+ encryption=none
596+ rnr=1
597+ background_radar=1
developere2597ba2022-06-24 13:09:16 +0800598+ else
developer659b07e2023-05-25 12:34:13 +0800599+ noscan=1
developere2597ba2022-06-24 13:09:16 +0800600+ encryption=none
developer2c6592a2023-07-21 11:20:56 +0800601+ rnr=1
developere2597ba2022-06-24 13:09:16 +0800602+ fi
603 done
604 }
605
developer75c99f42023-09-04 11:28:21 +0800606@@ -153,6 +188,10 @@ detect_mac80211() {
developer785b6502023-04-19 18:31:11 +0800607
608 json_load_file /etc/board.json
609
610+ # generate random bytes for macaddr
611+ rand=$(hexdump -C /dev/urandom | head -n 1 &)
612+ killall hexdump
613+
614 for _dev in /sys/class/ieee80211/*; do
615 [ -e "$_dev" ] || continue
616
developer75c99f42023-09-04 11:28:21 +0800617@@ -162,6 +201,14 @@ detect_mac80211() {
developere2597ba2022-06-24 13:09:16 +0800618 channel=""
619 htmode=""
620 ht_capab=""
621+ encryption=""
developer659b07e2023-05-25 12:34:13 +0800622+ noscan=""
developere2597ba2022-06-24 13:09:16 +0800623+ key=""
developer09257932023-05-09 13:41:30 +0800624+ sae_pwe=""
developer20ce7bd2023-05-20 13:25:14 +0800625+ ieee80211w=""
developeradbb45b2023-06-09 14:43:01 +0800626+ mbssid=""
developer2c6592a2023-07-21 11:20:56 +0800627+ rnr=""
developer75c99f42023-09-04 11:28:21 +0800628+ background_radar=""
developere2597ba2022-06-24 13:09:16 +0800629
630 get_band_defaults "$dev"
631
developer75c99f42023-09-04 11:28:21 +0800632@@ -196,6 +243,14 @@ detect_mac80211() {
developer785b6502023-04-19 18:31:11 +0800633 ;;
634 esac
635
developer212c0d82023-07-13 19:41:47 +0800636+ macaddr=""
developer1325ba72023-06-26 13:43:31 +0800637+ if (dmesg | grep -q "eeprom load fail"); then
developer1952bcd2023-06-20 20:14:37 +0800638+ for i in $(seq 2 3); do
639+ macaddr=${macaddr}:$(echo $rand | cut -d ' ' -f $i)
640+ done
641+ macaddr="00:0$(($devidx - 1)):55:66${macaddr}"
developer1952bcd2023-06-20 20:14:37 +0800642+ fi
developer785b6502023-04-19 18:31:11 +0800643+
644 uci -q batch <<-EOF
645 set wireless.${name}=wifi-device
646 set wireless.${name}.type=mac80211
developer75c99f42023-09-04 11:28:21 +0800647@@ -203,15 +258,43 @@ detect_mac80211() {
developer09257932023-05-09 13:41:30 +0800648 set wireless.${name}.channel=${channel}
649 set wireless.${name}.band=${mode_band}
650 set wireless.${name}.htmode=$htmode
651- set wireless.${name}.disabled=1
developer20ce7bd2023-05-20 13:25:14 +0800652+ set wireless.${name}.country='US'
developer659b07e2023-05-25 12:34:13 +0800653+ set wireless.${name}.noscan=${noscan}
developer09257932023-05-09 13:41:30 +0800654+ set wireless.${name}.disabled=0
developeradbb45b2023-06-09 14:43:01 +0800655+EOF
656+ [ -n "$mbssid" ] && {
657+ uci -q set wireless.${name}.mbssid=${mbssid}
658+ }
developer2c6592a2023-07-21 11:20:56 +0800659+ [ -n "$rnr" ] && {
660+ uci -q set wireless.${name}.rnr=${rnr}
661+ }
developer75c99f42023-09-04 11:28:21 +0800662+ [ -n "$background_radar" ] && {
663+ uci -q set wireless.${name}.background_radar=${background_radar}
664+ }
developer09257932023-05-09 13:41:30 +0800665
developeradbb45b2023-06-09 14:43:01 +0800666+ uci -q batch <<-EOF
developer09257932023-05-09 13:41:30 +0800667 set wireless.default_${name}=wifi-iface
668 set wireless.default_${name}.device=${name}
developer8d77be32022-10-20 15:08:25 +0800669 set wireless.default_${name}.network=lan
670 set wireless.default_${name}.mode=ap
developer09257932023-05-09 13:41:30 +0800671- set wireless.default_${name}.ssid=OpenWrt
developer8d77be32022-10-20 15:08:25 +0800672- set wireless.default_${name}.encryption=none
developer09257932023-05-09 13:41:30 +0800673+ set wireless.default_${name}.ssid=OpenWrt-${mode_band}
developer8d77be32022-10-20 15:08:25 +0800674+ set wireless.default_${name}.encryption=${encryption}
developere2597ba2022-06-24 13:09:16 +0800675 EOF
developer212c0d82023-07-13 19:41:47 +0800676+
677+ # calibrated board will use eeprom macaddress, not ramdom address
678+ [ -n "$macaddr" ] && {
679+ uci -q set wireless.default_${name}.macaddr=${macaddr}
680+ }
681+
developere2597ba2022-06-24 13:09:16 +0800682+ [ -n "$key" ] && {
developer8d77be32022-10-20 15:08:25 +0800683+ uci -q set wireless.default_${name}.key=${key}
developere2597ba2022-06-24 13:09:16 +0800684+ }
developer09257932023-05-09 13:41:30 +0800685+ [ -n "$sae_pwe" ] && {
686+ uci -q set wireless.default_${name}.sae_pwe=${sae_pwe}
687+ }
developer20ce7bd2023-05-20 13:25:14 +0800688+ [ -n "$ieee80211w" ] && {
689+ uci -q set wireless.default_${name}.ieee80211w=${ieee80211w}
690+ }
developere2597ba2022-06-24 13:09:16 +0800691 uci -q commit wireless
developer8d77be32022-10-20 15:08:25 +0800692 done
693 }
developer85839fe2023-02-23 10:32:51 +0800694diff --git a/package/network/services/hostapd/files/hostapd.sh b/package/network/services/hostapd/files/hostapd.sh
developer39a1e782023-10-27 17:44:18 +0800695index 271c1f7..c668e82 100644
developer85839fe2023-02-23 10:32:51 +0800696--- a/package/network/services/hostapd/files/hostapd.sh
697+++ b/package/network/services/hostapd/files/hostapd.sh
developer74503112023-06-29 17:34:49 +0800698@@ -60,7 +60,14 @@ hostapd_append_wpa_key_mgmt() {
developer93607dd2023-08-30 04:53:00 +0800699 append wpa_key_mgmt "WPA-EAP-SHA256"
developer74503112023-06-29 17:34:49 +0800700 ;;
701 sae)
702- append wpa_key_mgmt "SAE"
703+ case "$encryption" in
704+ *sae-ext*)
705+ append wpa_key_mgmt "SAE-EXT-KEY"
706+ ;;
707+ *)
708+ append wpa_key_mgmt "SAE"
709+ ;;
710+ esac
711 [ "${ieee80211r:-0}" -gt 0 ] && append wpa_key_mgmt "FT-SAE"
712 ;;
713 psk-sae)
developer93607dd2023-08-30 04:53:00 +0800714@@ -119,6 +126,7 @@ hostapd_common_add_device_config() {
developer74503112023-06-29 17:34:49 +0800715 config_add_int rts_threshold
716 config_add_int rssi_reject_assoc_rssi
717 config_add_int rssi_ignore_probe_request
718+ config_add_int rssi_reject_assoc_timeout
719 config_add_int maxassoc
720
721 config_add_string acs_chan_bias
developer93607dd2023-08-30 04:53:00 +0800722@@ -231,8 +239,10 @@ hostapd_prepare_device_config() {
developer74503112023-06-29 17:34:49 +0800723 hostapd_add_rate brlist "$br"
724 done
725
726+ json_get_vars rssi_reject_assoc_timeout
727 [ -n "$rssi_reject_assoc_rssi" ] && append base_cfg "rssi_reject_assoc_rssi=$rssi_reject_assoc_rssi" "$N"
728 [ -n "$rssi_ignore_probe_request" ] && append base_cfg "rssi_ignore_probe_request=$rssi_ignore_probe_request" "$N"
729+ [ -n "$rssi_reject_assoc_timeout" ] && append base_cfg "rssi_reject_assoc_timeout=$rssi_reject_assoc_timeout" "$N"
730 [ -n "$beacon_rate" ] && append base_cfg "beacon_rate=$beacon_rate" "$N"
731 [ -n "$rlist" ] && append base_cfg "supported_rates=$rlist" "$N"
732 [ -n "$brlist" ] && append base_cfg "basic_rates=$brlist" "$N"
developer93607dd2023-08-30 04:53:00 +0800733@@ -383,6 +393,24 @@ hostapd_common_add_bss_config() {
developer82408892023-03-27 15:09:00 +0800734 config_add_string fils_dhcp
735
736 config_add_int ocv
737+
738+ config_add_int disable_eht
739+ config_add_int disable_he
740+ config_add_int disable_vht
741+ config_add_int disable_ht
developer813f5d72023-03-28 17:44:38 +0800742+
developerf166f542023-05-25 14:40:30 +0800743+ config_add_boolean beacon_prot interworking
developer74503112023-06-29 17:34:49 +0800744+
745+ config_add_int unsol_bcast_probe_resp_interval
746+ config_add_int fils_discovery_min_interval
747+ config_add_int fils_discovery_max_interval
748+ config_add_boolean rnr
749+
750+ config_add_array sae_groups
751+ config_add_array owe_groups
752+ config_add_array pairwise
753+ config_add_string group_cipher
754+
developer82408892023-03-27 15:09:00 +0800755 }
756
757 hostapd_set_vlan_file() {
developer93607dd2023-08-30 04:53:00 +0800758@@ -447,11 +475,11 @@ append_iw_nai_realm() {
developerf166f542023-05-25 14:40:30 +0800759 }
760
761 append_iw_venue_name() {
762- append bss_conf "venue_name=$1" "$N"
763+ [ -n "$1" ] && append bss_conf "venue_name=$1" "$N"
764 }
765
766 append_iw_venue_url() {
767- append bss_conf "venue_url=$1" "$N"
768+ [ -n "$1" ] && append bss_conf "venue_url=$1" "$N"
769 }
770
771 append_hs20_oper_friendly_name() {
developer93607dd2023-08-30 04:53:00 +0800772@@ -569,7 +597,8 @@ hostapd_set_bss_options() {
developer74503112023-06-29 17:34:49 +0800773 ppsk airtime_bss_weight airtime_bss_limit airtime_sta_weight \
774 multicast_to_unicast_all proxy_arp per_sta_vif \
775 eap_server eap_user_file ca_cert server_cert private_key private_key_passwd server_id \
776- vendor_elements fils ocv
777+ vendor_elements fils ocv unsol_bcast_probe_resp_interval fils_discovery_min_interval \
778+ fils_discovery_max_interval rnr group_cipher
779
780 set_default fils 0
781 set_default isolate 0
developer945ed992023-10-25 15:01:32 +0800782@@ -796,6 +825,36 @@ hostapd_set_bss_options() {
developer74503112023-06-29 17:34:49 +0800783 local auth_algs="$((($auth_mode_shared << 1) | $auth_mode_open))"
784 append bss_conf "auth_algs=${auth_algs:-1}" "$N"
785 append bss_conf "wpa=$wpa" "$N"
786+
787+ json_get_values pairwise pairwise
developer945ed992023-10-25 15:01:32 +0800788+ json_get_vars group_cipher
developer9097e5e2023-07-19 10:22:24 +0800789+ if [ -n "$pairwise" ]; then
790+ case "$pairwise" in
791+ *tkip+aes|*tkip+ccmp|*aes+tkip|*ccmp+tkip)
792+ wpa_cipher="CCMP TKIP"
793+ ;;
794+ *ccmp256)
795+ wpa_cipher="CCMP-256"
796+ ;;
797+ *aes|*ccmp)
798+ wpa_cipher="CCMP"
799+ ;;
800+ *tkip)
801+ wpa_cipher="TKIP"
802+ ;;
803+ *gcmp256)
804+ wpa_cipher="GCMP-256"
805+ ;;
806+ *gcmp)
807+ wpa_cipher="GCMP"
808+ ;;
809+ *)
810+ wpa_cipher=""
811+ ;;
812+ esac
813+ fi
developer74503112023-06-29 17:34:49 +0800814+ [ -n "$wpa_cipher" ] && wpa_pairwise="$wpa_cipher"
815+
816 [ -n "$wpa_pairwise" ] && append bss_conf "wpa_pairwise=$wpa_pairwise" "$N"
817
818 set_default wps_pushbutton 0
developer945ed992023-10-25 15:01:32 +0800819@@ -847,7 +906,7 @@ hostapd_set_bss_options() {
developerda723192023-05-22 19:46:10 +0800820 }
821
822 append bss_conf "ssid=$ssid" "$N"
823- [ -n "$network_bridge" ] && append bss_conf "bridge=$network_bridge${N}wds_bridge=" "$N"
824+ [ -n "$network_bridge" ] && append bss_conf "bridge=$network_bridge${N}wds_bridge=$network_bridge" "$N"
825 [ -n "$network_ifname" ] && append bss_conf "snoop_iface=$network_ifname" "$N"
826 [ -n "$iapp_interface" ] && {
827 local ifname
developer945ed992023-10-25 15:01:32 +0800828@@ -962,6 +1021,8 @@ hostapd_set_bss_options() {
developer74503112023-06-29 17:34:49 +0800829 fi
830
831 if [ "$wpa" -ge "2" ]; then
832+ json_get_values sae_groups sae_groups
833+ json_get_values owe_groups owe_groups
834 if [ -n "$network_bridge" -a "$rsn_preauth" = 1 ]; then
835 set_default auth_cache 1
836 append bss_conf "rsn_preauth=1" "$N"
developer945ed992023-10-25 15:01:32 +0800837@@ -980,17 +1041,42 @@ hostapd_set_bss_options() {
developer74503112023-06-29 17:34:49 +0800838 append bss_conf "okc=$auth_cache" "$N"
839 [ "$auth_cache" = 0 -a "$fils" = 0 ] && append bss_conf "disable_pmksa_caching=1" "$N"
840
841+ [ -z "$group_cipher" ] && group_cipher="$wpa_cipher"
842+
843+ if [ -n "$sae_groups" -o -n "$owe_groups" ]; then
844+ case "$auth_type" in
845+ sae*)
846+ append bss_conf "sae_groups=$sae_groups" "$N"
847+ append bss_conf "group_cipher=$group_cipher" "$N"
848+ ;;
849+ owe)
850+ append bss_conf "owe_groups=$owe_groups" "$N"
851+ append bss_conf "group_cipher=$group_cipher" "$N"
852+ ;;
853+ esac
854+ fi
855+
developer813f5d72023-03-28 17:44:38 +0800856 # RSN -> allow management frame protection
857 case "$ieee80211w" in
858 [012])
859- json_get_vars ieee80211w_mgmt_cipher ieee80211w_max_timeout ieee80211w_retry_timeout
860+ json_get_vars ieee80211w_mgmt_cipher ieee80211w_max_timeout ieee80211w_retry_timeout beacon_prot
861 append bss_conf "ieee80211w=$ieee80211w" "$N"
862 [ "$ieee80211w" -gt "0" ] && {
developer74503112023-06-29 17:34:49 +0800863+ case "$group_cipher" in
864+ CCMP*)
865+ ieee80211w_mgmt_cipher="AES-128-CMAC"
866+ ;;
867+ GCMP-256)
868+ [[ "$encryption" != "*owe*" ]] && ieee80211w_mgmt_cipher="BIP-GMAC-256"
869+ ;;
870+ esac
developer813f5d72023-03-28 17:44:38 +0800871 if [ "$auth_type" = "eap192" ]; then
developer74503112023-06-29 17:34:49 +0800872 append bss_conf "group_mgmt_cipher=BIP-GMAC-256" "$N"
developer813f5d72023-03-28 17:44:38 +0800873 else
874 append bss_conf "group_mgmt_cipher=${ieee80211w_mgmt_cipher:-AES-128-CMAC}" "$N"
875 fi
876+ [ -n "$beacon_prot" ] && \
877+ append bss_conf "beacon_prot=$beacon_prot" "$N"
878 [ -n "$ieee80211w_max_timeout" ] && \
879 append bss_conf "assoc_sa_query_max_timeout=$ieee80211w_max_timeout" "$N"
880 [ -n "$ieee80211w_retry_timeout" ] && \
developer945ed992023-10-25 15:01:32 +0800881@@ -1055,9 +1141,10 @@ hostapd_set_bss_options() {
developerf166f542023-05-25 14:40:30 +0800882 json_get_vars iw_roaming_consortium iw_domain_name iw_anqp_3gpp_cell_net iw_nai_realm
883 json_get_vars iw_anqp_elem iw_qos_map_set iw_ipaddr_type_availability iw_gas_address3
884 json_get_vars iw_venue_name iw_venue_url
885+ json_get_vars interworking
886
887 set_default iw_enabled 0
888- if [ "$iw_enabled" = "1" ]; then
889+ if [ "$iw_enabled" = "1" ] || [ "$interworking" = "1" ]; then
890 append bss_conf "interworking=1" "$N"
891 set_default iw_internet 1
892 set_default iw_asra 0
developer945ed992023-10-25 15:01:32 +0800893@@ -1164,6 +1251,22 @@ hostapd_set_bss_options() {
developer74503112023-06-29 17:34:49 +0800894 append bss_conf "$val" "$N"
895 done
896
897+ if [ "$unsol_bcast_probe_resp_interval" -gt 0 ]; then
898+ append bss_conf "unsol_bcast_probe_resp_interval=$unsol_bcast_probe_resp_interval" "$N"
899+ fi
900+
901+ if [ -n "$fils_discovery_min_interval" ]; then
902+ append bss_conf "fils_discovery_min_interval=$fils_discovery_min_interval" "$N"
903+ fi
904+
905+ if [ -n "$fils_discovery_max_interval" ]; then
906+ append bss_conf "fils_discovery_max_interval=$fils_discovery_max_interval" "$N"
907+ fi
908+
909+ if [ -n "$rnr" ]; then
910+ append bss_conf "rnr=$rnr" "$N"
911+ fi
912+
developer5b3b7a92023-08-12 03:41:52 +0800913 append "$var" "$bss_conf" "$N"
914 return 0
915 }
developer945ed992023-10-25 15:01:32 +0800916@@ -1251,6 +1354,7 @@ wpa_supplicant_prepare_interface() {
developer18015ad2023-07-13 13:18:19 +0800917 country_str="country=$country"
918 }
919
developer2cf3f4c2023-07-24 16:58:25 +0800920+ local tx_queue_data2_burst="tx_queue_data2_burst=0"
developer18015ad2023-07-13 13:18:19 +0800921 multiap_flag_file="${_config}.is_multiap"
922 if [ "$multi_ap" = "1" ]; then
923 touch "$multiap_flag_file"
developer945ed992023-10-25 15:01:32 +0800924@@ -1262,6 +1366,7 @@ wpa_supplicant_prepare_interface() {
developer18015ad2023-07-13 13:18:19 +0800925 ${scan_list:+freq_list=$scan_list}
926 $ap_scan
927 $country_str
928+$tx_queue_data2_burst
929 EOF
930 return 0
931 }
developer945ed992023-10-25 15:01:32 +0800932@@ -1533,12 +1638,39 @@ wpa_supplicant_add_network() {
developer74503112023-06-29 17:34:49 +0800933 ;;
934 esac
935
developerbb29b5e2023-07-25 20:41:04 +0800936- [ "$wpa_cipher" = GCMP ] && {
937- append network_data "pairwise=GCMP" "$N$T"
938- append network_data "group=GCMP" "$N$T"
939- }
developer74503112023-06-29 17:34:49 +0800940+ json_get_values pairwise pairwise
developer945ed992023-10-25 15:01:32 +0800941+ json_get_vars group_cipher
developer9097e5e2023-07-19 10:22:24 +0800942+ if [ -n "$pairwise" ]; then
943+ case "$pairwise" in
944+ *tkip+aes|*tkip+ccmp|*aes+tkip|*ccmp+tkip)
945+ wpa_cipher="CCMP TKIP"
946+ ;;
947+ *ccmp256)
948+ wpa_cipher="CCMP-256"
949+ ;;
950+ *aes|*ccmp)
951+ wpa_cipher="CCMP"
952+ ;;
953+ *tkip)
954+ wpa_cipher="TKIP"
955+ ;;
956+ *gcmp256)
957+ wpa_cipher="GCMP-256"
958+ ;;
959+ *gcmp)
960+ wpa_cipher="GCMP"
961+ ;;
962+ *)
963+ wpa_cipher=""
964+ ;;
965+ esac
966+ fi
developer74503112023-06-29 17:34:49 +0800967+ [ -n "$wpa_cipher" ] && wpa_pairwise="$wpa_cipher"
developer74503112023-06-29 17:34:49 +0800968
969 [ "$mode" = mesh ] || {
970+ json_get_values sae_groups sae_groups
971+ json_get_values owe_groups owe_groups
972+
973 case "$wpa" in
974 1)
975 append network_data "proto=WPA" "$N$T"
developer945ed992023-10-25 15:01:32 +0800976@@ -1548,12 +1680,48 @@ wpa_supplicant_add_network() {
developer74503112023-06-29 17:34:49 +0800977 ;;
978 esac
979
980+ [ -n "$wpa_pairwise" ] && append network_data "pairwise=$wpa_pairwise" "$N$T"
981+ [ -z "$group_cipher" ] && group_cipher="$wpa_cipher"
982+
983+ if [ -n "$sae_groups" -o -n "$owe_groups" ]; then
984+ case "$auth_type" in
985+ sae*)
986+ echo "sae_groups=$sae_groups" >> "$_config"
987+ append network_data "group=$group_cipher" "$N$T"
988+ ;;
989+ owe)
990+ append network_data "owe_group=$owe_groups" "$N$T"
991+ append network_data "group=$group_cipher" "$N$T"
992+ ;;
993+ esac
994+ fi
995+
996+ # RSN -> allow management frame protection
997 case "$ieee80211w" in
998 [012])
999- [ "$wpa" -ge 2 ] && append network_data "ieee80211w=$ieee80211w" "$N$T"
1000+ json_get_vars ieee80211w_mgmt_cipher ieee80211w_max_timeout ieee80211w_retry_timeout beacon_prot
1001+ append network_data "ieee80211w=$ieee80211w" "$N$T"
1002+ [ "$ieee80211w" -gt "0" ] && {
1003+ case "$group_cipher" in
1004+ CCMP*)
1005+ ieee80211w_mgmt_cipher="AES-128-CMAC"
1006+ ;;
1007+ GCMP-256)
1008+ [[ "$encryption" != "*owe*" ]] && ieee80211w_mgmt_cipher="BIP-GMAC-256"
1009+ ;;
1010+ esac
1011+ if [ "$auth_type" = "eap192" ]; then
1012+ append network_data "group_mgmt=BIP-GMAC-256" "$N$T"
1013+ else
1014+ append network_data "group_mgmt=${ieee80211w_mgmt_cipher:-AES-128-CMAC}" "$N$T"
1015+ fi
1016+ [ -n "$beacon_prot" ] && \
1017+ append network_data "beacon_prot=$beacon_prot" "$N$T"
1018+ }
1019 ;;
1020 esac
1021 }
1022+
1023 [ -n "$bssid" ] && append network_data "bssid=$bssid" "$N$T"
1024 [ -n "$beacon_int" ] && append network_data "beacon_int=$beacon_int" "$N$T"
1025
developer945ed992023-10-25 15:01:32 +08001026@@ -1564,6 +1732,20 @@ wpa_supplicant_add_network() {
developer82408892023-03-27 15:09:00 +08001027 [ -n "$bssid_blacklist" ] && append network_data "bssid_blacklist=$bssid_blacklist" "$N$T"
1028 [ -n "$bssid_whitelist" ] && append network_data "bssid_whitelist=$bssid_whitelist" "$N$T"
1029
1030+ local disable_eht
1031+ local disable_he
1032+ local disable_vht
1033+ local disable_ht
1034+ json_get_vars disable_eht
1035+ json_get_vars disable_he
1036+ json_get_vars disable_vht
1037+ json_get_vars disable_ht
1038+
1039+ [ -n "$disable_eht" ] && append network_data "disable_eht=$disable_eht" "$N$T"
1040+ [ -n "$disable_he" ] && append network_data "disable_he=$disable_he" "$N$T"
1041+ [ -n "$disable_vht" ] && append network_data "disable_vht=$disable_vht" "$N$T"
1042+ [ -n "$disable_ht" ] && append network_data "disable_ht=$disable_ht" "$N$T"
1043+
1044 [ -n "$basic_rate" ] && {
1045 local br rate_list=
1046 for br in $basic_rate; do
developer945ed992023-10-25 15:01:32 +08001047@@ -1578,6 +1760,11 @@ wpa_supplicant_add_network() {
developer85839fe2023-02-23 10:32:51 +08001048 append network_data "mcast_rate=$mc_rate" "$N$T"
1049 }
1050
1051+ if [ "$auth_type" = "sae" ]; then
1052+ json_get_vars sae_pwe sae_pwe
1053+ [ -n "$sae_pwe" ] && echo "sae_pwe=$sae_pwe" >> "$_config"
1054+ fi
1055+
1056 if [ "$key_mgmt" = "WPS" ]; then
1057 echo "wps_cred_processing=1" >> "$_config"
1058 else