blob: 9bbb5c3c60064095e66c81ff3c235c88808f8062 [file] [log] [blame]
developerce9e5092022-11-10 22:41:59 +08001diff --git a/package/kernel/mac80211/Makefile b/package/kernel/mac80211/Makefile
developer5ad89862023-08-24 08:17:27 +08002index 8ecbe30..44af0c7 100644
developerce9e5092022-11-10 22:41:59 +08003--- a/package/kernel/mac80211/Makefile
4+++ b/package/kernel/mac80211/Makefile
developer5ad89862023-08-24 08:17:27 +08005@@ -19,6 +19,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 = \
developer5ad89862023-08-24 08:17:27 +080013@@ -71,6 +72,11 @@ 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 \
developer5ad89862023-08-24 08:17:27 +080021+ MAC80211_PS_DEBUG \
developer6ec8e342022-11-21 18:47:15 +080022
23 config-$(call config_package,cfg80211) += CFG80211
24 config-$(CONFIG_PACKAGE_CFG80211_TESTMODE) += NL80211_TESTMODE
developer5ad89862023-08-24 08:17:27 +080025@@ -296,6 +302,8 @@ define Build/Prepare
developer356ecec2022-11-14 10:25:04 +080026 mkdir -p $(PKG_BUILD_DIR)
27 $(PKG_UNPACK)
28 $(Build/Patch)
29+ $(CP) $(SOURCE_PATH)/net $(PKG_BUILD_DIR) 2>/dev/null || :
30+ $(CP) $(SOURCE_PATH)/include $(PKG_BUILD_DIR) 2>/dev/null || :
31 rm -rf \
32 $(PKG_BUILD_DIR)/include/linux/ssb \
33 $(PKG_BUILD_DIR)/include/linux/bcma \
developer20d67712022-03-02 14:09:32 +080034diff --git a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
developer6cfee682023-11-27 19:34:42 +080035index ed28052..c353d6a 100644
developer20d67712022-03-02 14:09:32 +080036--- a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
37+++ b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
developer0ba09b62023-03-10 18:43:49 +080038@@ -27,6 +27,7 @@ drv_mac80211_init_device_config() {
39
40 config_add_string path phy 'macaddr:macaddr'
41 config_add_string tx_burst
developer61604c82023-09-04 14:43:31 +080042+ config_add_int mbssid mu_onoff sr_enable sr_enhanced rnr obss_interval
developer0ba09b62023-03-10 18:43:49 +080043 config_add_string distance
44 config_add_int beacon_int chanbw frag rts
45 config_add_int rxantenna txantenna antenna_gain txpower min_tx_power
developer785b6502023-04-19 18:31:11 +080046@@ -53,7 +54,10 @@ drv_mac80211_init_device_config() {
47 he_spr_sr_control \
48 he_spr_psr_enabled \
49 he_bss_color_enabled \
50- he_twt_required
51+ he_twt_required \
52+ he_twt_responder \
53+ etxbfen \
54+ itxbfen
55 config_add_int \
56 beamformer_antennas \
57 beamformee_antennas \
58@@ -140,13 +144,11 @@ mac80211_hostapd_setup_base() {
developer0ba09b62023-03-10 18:43:49 +080059 [ -n "$acs_exclude_dfs" ] && [ "$acs_exclude_dfs" -gt 0 ] &&
60 append base_cfg "acs_exclude_dfs=1" "$N"
61
62- json_get_vars noscan ht_coex min_tx_power:0 tx_burst
developer61604c82023-09-04 14:43:31 +080063+ json_get_vars noscan ht_coex min_tx_power:0 tx_burst mbssid mu_onoff rnr obss_interval
developer2c4f7e82023-05-11 19:56:55 +080064+ json_get_vars etxbfen:1 itxbfen:0
developer8d77be32022-10-20 15:08:25 +080065 json_get_values ht_capab_list ht_capab
developer20d67712022-03-02 14:09:32 +080066 json_get_values channel_list channels
67
68- [ "$auto_channel" = 0 ] && [ -z "$channel_list" ] && \
69- channel_list="$channel"
70-
developer9b3248d2022-07-06 00:44:05 +080071 [ "$min_tx_power" -gt 0 ] && append base_cfg "min_tx_power=$min_tx_power"
developer20d67712022-03-02 14:09:32 +080072
developer9b3248d2022-07-06 00:44:05 +080073 set_default noscan 0
developerda1bac72023-09-19 10:32:47 +080074@@ -160,21 +162,42 @@ mac80211_hostapd_setup_base() {
developer785b6502023-04-19 18:31:11 +080075 ieee80211n=1
76 ht_capab=
77 case "$htmode" in
78- VHT20|HT20|HE20) ;;
79- HT40*|VHT40|VHT80|VHT160|HE40|HE80|HE160)
80+ VHT20|HT20|HE20|EHT20) ;;
developerbe3cf972023-04-27 09:58:26 +080081+ HT40*|VHT40|VHT80|VHT160|HE40*|HE80|HE160|EHT40*|EHT80|EHT160|EHT320*)
developer785b6502023-04-19 18:31:11 +080082 case "$hwmode" in
83 a)
84 case "$(( (($channel / 4) + $chan_ofs) % 2 ))" in
developerda1bac72023-09-19 10:32:47 +080085 1) ht_capab="[HT40+]";;
86 0) ht_capab="[HT40-]";;
87 esac
88+ case "$htmode" in
89+ HT40-|HE40-|EHT40-)
90+ if [ "$auto_channel" -gt 0 ]; then
91+ ht_capab="[HT40-]"
92+ fi
93+ ;;
94+ esac
developerbe3cf972023-04-27 09:58:26 +080095 ;;
96 *)
97 case "$htmode" in
98- HT40+) ht_capab="[HT40+]";;
99- HT40-) ht_capab="[HT40-]";;
100+ HT40+|HE40+|EHT40+)
101+ if [ "$channel" -gt 9 ]; then
102+ echo "Could not set the center freq with this HT mode setting"
103+ return 1
104+ else
105+ ht_capab="[HT40+]"
106+ fi
107+ ;;
108+ HT40-|HE40-|EHT40-)
developerda1bac72023-09-19 10:32:47 +0800109+ if [ "$channel" -lt 5 -a "$auto_channel" -eq 0 ]; then
developerbe3cf972023-04-27 09:58:26 +0800110+ echo "Could not set the center freq with this HT mode setting"
111+ return 1
112+ else
113+ ht_capab="[HT40-]"
114+ fi
115+ ;;
116 *)
developerda1bac72023-09-19 10:32:47 +0800117- if [ "$channel" -lt 7 ]; then
118+ if [ "$channel" -lt 7 -o "$auto_channel" -gt 0 ]; then
developerbe3cf972023-04-27 09:58:26 +0800119 ht_capab="[HT40+]"
developerda1bac72023-09-19 10:32:47 +0800120 else
121 ht_capab="[HT40-]"
122@@ -183,7 +206,6 @@ mac80211_hostapd_setup_base() {
123 esac
124 ;;
125 esac
126- [ "$auto_channel" -gt 0 ] && ht_capab="[HT40+]"
127 ;;
128 *) ieee80211n= ;;
129 esac
130@@ -193,6 +215,10 @@ mac80211_hostapd_setup_base() {
developer61604c82023-09-04 14:43:31 +0800131
132 set_default ht_coex 0
133 append base_cfg "ht_coex=$ht_coex" "$N"
134+ [ "$ht_coex" -eq 1 ] && {
135+ set_default obss_interval 300
136+ append base_cfg "obss_interval=$obss_interval" "$N"
137+ }
138
139 json_get_vars \
140 ldpc:1 \
developerda1bac72023-09-19 10:32:47 +0800141@@ -205,7 +231,7 @@ mac80211_hostapd_setup_base() {
developer785b6502023-04-19 18:31:11 +0800142 dsss_cck_40:1
143
144 ht_cap_mask=0
145- for cap in $(iw phy "$phy" info | grep 'Capabilities:' | cut -d: -f2); do
146+ for cap in $(iw phy "$phy" info | grep 'Capabilities: 0x' | cut -d: -f2); do
147 ht_cap_mask="$(($ht_cap_mask | $cap))"
148 done
149
developerda1bac72023-09-19 10:32:47 +0800150@@ -236,8 +262,8 @@ mac80211_hostapd_setup_base() {
developer785b6502023-04-19 18:31:11 +0800151
152 idx="$channel"
153 case "$htmode" in
154- VHT20|HE20) enable_ac=1;;
155- VHT40|HE40)
156+ VHT20|HE20|EHT20) enable_ac=1;;
157+ VHT40|HE40|EHT40)
158 case "$(( (($channel / 4) + $chan_ofs) % 2 ))" in
159 1) idx=$(($channel + 2));;
160 0) idx=$(($channel - 2));;
developerda1bac72023-09-19 10:32:47 +0800161@@ -245,7 +271,7 @@ mac80211_hostapd_setup_base() {
developer785b6502023-04-19 18:31:11 +0800162 enable_ac=1
163 vht_center_seg0=$idx
164 ;;
165- VHT80|HE80)
166+ VHT80|HE80|EHT80)
167 case "$(( (($channel / 4) + $chan_ofs) % 4 ))" in
168 1) idx=$(($channel + 6));;
169 2) idx=$(($channel + 2));;
developerda1bac72023-09-19 10:32:47 +0800170@@ -256,7 +282,7 @@ mac80211_hostapd_setup_base() {
developer785b6502023-04-19 18:31:11 +0800171 vht_oper_chwidth=1
172 vht_center_seg0=$idx
173 ;;
174- VHT160|HE160)
175+ VHT160|HE160|EHT160)
176 if [ "$band" = "6g" ]; then
177 case "$channel" in
178 1|5|9|13|17|21|25|29) idx=15;;
developerda1bac72023-09-19 10:32:47 +0800179@@ -271,12 +297,43 @@ mac80211_hostapd_setup_base() {
developeradd8de62023-05-02 16:25:52 +0800180 case "$channel" in
181 36|40|44|48|52|56|60|64) idx=50;;
182 100|104|108|112|116|120|124|128) idx=114;;
183+ 149|153|157|161|165|169|173|177) idx=163;;
184 esac
185 fi
186 enable_ac=1
developer785b6502023-04-19 18:31:11 +0800187 vht_oper_chwidth=2
188 vht_center_seg0=$idx
189 ;;
190+ EHT320*)
191+ case "$channel" in
192+ 1|5|9|13|17|21|25|29) idx=31;;
193+ 33|37|41|45|49|53|57|61| \
194+ 65|69|73|77|81|85|89|93) idx=63;;
195+ 97|101|105|109|113|117|121|125| \
196+ 129|133|137|141|145|149|153|157) idx=127;;
197+ 161|165|169|173|177|181|185|189| \
198+ 193|197|201|205|209|213|217|221) idx=191;;
199+ esac
200+ if [[ "$htmode" = "EHT320-1" && "$channel" -ge "193" ]] ||
201+ [[ "$htmode" = "EHT320-2" && "$channel" -le "29" ]]; then
202+ echo "Could not set the center freq with this EHT setting"
203+ return 1
204+ elif [[ "$htmode" = "EHT320-1" && "$channel" -ge "33" ]]; then
205+ if [ "$channel" -gt $idx ]; then
206+ idx=$(($idx + 32))
207+ else
208+ idx=$(($idx - 32))
209+ fi
210+ fi
211+ vht_oper_chwidth=2
212+ if [ "$channel" -gt $idx ]; then
213+ vht_center_seg0=$(($idx + 16))
214+ else
215+ vht_center_seg0=$(($idx - 16))
216+ fi
217+ eht_oper_chwidth=9
218+ eht_oper_centr_freq_seg0_idx=$idx
219+ ;;
220 esac
221 [ "$band" = "5g" ] && {
222 json_get_vars background_radar:0
developerda1bac72023-09-19 10:32:47 +0800223@@ -286,8 +343,9 @@ mac80211_hostapd_setup_base() {
developer785b6502023-04-19 18:31:11 +0800224 [ "$band" = "6g" ] && {
225 op_class=
226 case "$htmode" in
227- HE20) op_class=131;;
228- HE*) op_class=$((132 + $vht_oper_chwidth))
229+ HE20|EHT20) op_class=131;;
230+ EHT320*) op_class=137;;
231+ HE*|EHT*) op_class=$((132 + $vht_oper_chwidth))
232 esac
233 [ -n "$op_class" ] && append base_cfg "op_class=$op_class" "$N"
234 }
developerda1bac72023-09-19 10:32:47 +0800235@@ -315,7 +373,6 @@ mac80211_hostapd_setup_base() {
developer8b04dfd2022-12-07 16:29:19 +0800236 vht_link_adapt:3 \
237 vht160:2
238
239- set_default tx_burst 2.0
240 append base_cfg "ieee80211ac=1" "$N"
241 vht_cap=0
242 for cap in $(iw phy "$phy" info | awk -F "[()]" '/VHT Capabilities/ { print $2 }'); do
developerda1bac72023-09-19 10:32:47 +0800243@@ -329,6 +386,12 @@ mac80211_hostapd_setup_base() {
developer785b6502023-04-19 18:31:11 +0800244 [ "$rx_stbc" -lt "$cap_rx_stbc" ] && cap_rx_stbc="$rx_stbc"
245 vht_cap="$(( ($vht_cap & ~(0x700)) | ($cap_rx_stbc << 8) ))"
246
247+ [ "$etxbfen" -eq 0 ] && {
248+ su_beamformer=0
249+ su_beamformee=0
250+ mu_beamformer=0
251+ }
252+
253 mac80211_add_capabilities vht_capab $vht_cap \
254 RXLDPC:0x10::$rxldpc \
255 SHORT-GI-80:0x20::$short_gi_80 \
developerda1bac72023-09-19 10:32:47 +0800256@@ -410,7 +473,7 @@ mac80211_hostapd_setup_base() {
developer785b6502023-04-19 18:31:11 +0800257 # 802.11ax
258 enable_ax=0
259 case "$htmode" in
260- HE*) enable_ax=1 ;;
261+ HE*|EHT*) enable_ax=1 ;;
262 esac
263
264 if [ "$enable_ax" != "0" ]; then
developerda1bac72023-09-19 10:32:47 +0800265@@ -419,10 +482,11 @@ mac80211_hostapd_setup_base() {
developer785b6502023-04-19 18:31:11 +0800266 he_su_beamformee:1 \
267 he_mu_beamformer:1 \
268 he_twt_required:0 \
269+ he_twt_responder \
270 he_spr_sr_control:3 \
271 he_spr_psr_enabled:0 \
272 he_spr_non_srg_obss_pd_max_offset:0 \
273- he_bss_color:128 \
274+ he_bss_color \
275 he_bss_color_enabled:1
276
277 he_phy_cap=$(iw phy "$phy" info | sed -n '/HE Iftypes: AP/,$p' | awk -F "[()]" '/HE PHY Capabilities/ { print $2 }' | head -1)
developerda1bac72023-09-19 10:32:47 +0800278@@ -436,6 +500,11 @@ mac80211_hostapd_setup_base() {
developer785b6502023-04-19 18:31:11 +0800279 append base_cfg "he_oper_centr_freq_seg0_idx=$vht_center_seg0" "$N"
280 }
281
282+ [ "$etxbfen" -eq 0 ] && {
283+ he_su_beamformer=0
284+ he_mu_beamformer=0
285+ }
286+
287 mac80211_add_he_capabilities \
288 he_su_beamformer:${he_phy_cap:6:2}:0x80:$he_su_beamformer \
289 he_su_beamformee:${he_phy_cap:8:2}:0x1:$he_su_beamformee \
developerda1bac72023-09-19 10:32:47 +0800290@@ -443,7 +512,14 @@ mac80211_hostapd_setup_base() {
developer785b6502023-04-19 18:31:11 +0800291 he_spr_psr_enabled:${he_phy_cap:14:2}:0x1:$he_spr_psr_enabled \
292 he_twt_required:${he_mac_cap:0:2}:0x6:$he_twt_required
293
294+ if [ -n "$he_twt_responder" ]; then
295+ append base_cfg "he_twt_responder=$he_twt_responder" "$N"
296+ fi
297 if [ "$he_bss_color_enabled" -gt 0 ]; then
developer830efa72023-05-18 19:32:48 +0800298+ if !([ "$he_bss_color" -gt 0 ] && [ "$he_bss_color" -le 64 ]); then
developer785b6502023-04-19 18:31:11 +0800299+ rand=$(head -n 1 /dev/urandom | tr -dc 0-9 | head -c 2)
300+ he_bss_color=$((rand % 63 + 1))
301+ fi
302 append base_cfg "he_bss_color=$he_bss_color" "$N"
303 [ "$he_spr_non_srg_obss_pd_max_offset" -gt 0 ] && { \
304 append base_cfg "he_spr_non_srg_obss_pd_max_offset=$he_spr_non_srg_obss_pd_max_offset" "$N"
developerda1bac72023-09-19 10:32:47 +0800305@@ -484,12 +560,47 @@ mac80211_hostapd_setup_base() {
developer8b04dfd2022-12-07 16:29:19 +0800306 append base_cfg "he_mu_edca_ac_vo_timer=255" "$N"
307 fi
308
developer18015ad2023-07-13 13:18:19 +0800309+ set_default tx_burst 2
developer8b04dfd2022-12-07 16:29:19 +0800310+
developer785b6502023-04-19 18:31:11 +0800311+ # 802.11be
312+ enable_be=0
313+ case "$htmode" in
314+ EHT*) enable_be=1 ;;
315+ esac
316+
317+ if [ "$enable_be" != "0" ]; then
318+ append base_cfg "ieee80211be=1" "$N"
319+ if [ "$etxbfen" -eq 0 ]; then
320+ append base_cfg "eht_su_beamformee=1" "$N"
321+ else
322+ append base_cfg "eht_su_beamformer=1" "$N"
323+ append base_cfg "eht_su_beamformee=1" "$N"
324+ append base_cfg "eht_mu_beamformer=1" "$N"
325+ fi
326+ [ "$hwmode" = "a" ] && {
327+ case $htmode in
328+ EHT320*)
329+ append base_cfg "eht_oper_chwidth=$eht_oper_chwidth" "$N"
330+ append base_cfg "eht_oper_centr_freq_seg0_idx=$eht_oper_centr_freq_seg0_idx" "$N"
331+ ;;
332+ *)
333+ append base_cfg "eht_oper_chwidth=$vht_oper_chwidth" "$N"
334+ append base_cfg "eht_oper_centr_freq_seg0_idx=$vht_center_seg0" "$N"
335+ ;;
336+ esac
337+ }
338+ fi
339+
developer8b04dfd2022-12-07 16:29:19 +0800340 hostapd_prepare_device_config "$hostapd_conf_file" nl80211
341 cat >> "$hostapd_conf_file" <<EOF
342 ${channel:+channel=$channel}
developer0ba09b62023-03-10 18:43:49 +0800343 ${channel_list:+chanlist=$channel_list}
344 ${hostapd_noscan:+noscan=1}
345 ${tx_burst:+tx_queue_data2_burst=$tx_burst}
346+${mbssid:+mbssid=$mbssid}
developer785b6502023-04-19 18:31:11 +0800347+${mu_onoff:+mu_onoff=$mu_onoff}
348+${itxbfen:+ibf_enable=$itxbfen}
developer2c6592a2023-07-21 11:20:56 +0800349+${rnr:+rnr=$rnr}
developer0ba09b62023-03-10 18:43:49 +0800350 $base_cfg
351
352 EOF
developerda1bac72023-09-19 10:32:47 +0800353@@ -517,7 +628,7 @@ mac80211_hostapd_setup_bss() {
developer093e1a32023-02-24 16:10:53 +0800354 append hostapd_cfg "wds_sta=1" "$N"
355 [ -n "$wds_bridge" ] && append hostapd_cfg "wds_bridge=$wds_bridge" "$N"
356 }
357- [ "$staidx" -gt 0 -o "$start_disabled" -eq 1 ] && append hostapd_cfg "start_disabled=1" "$N"
358+ [ "$start_disabled" -eq 1 ] && append hostapd_cfg "start_disabled=1" "$N"
359
360 cat >> /var/run/hostapd-$phy.conf <<EOF
361 $hostapd_cfg
developerda1bac72023-09-19 10:32:47 +0800362@@ -527,6 +638,31 @@ ${max_listen_int:+max_listen_interval=$max_listen_int}
developer0ba09b62023-03-10 18:43:49 +0800363 EOF
364 }
365
366+mac80211_generate_mbssid_mac() {
367+ local phy="$1"
368+ local transmitted_bssid="$2"
developer1952bcd2023-06-20 20:14:37 +0800369+ local id="${mbssidx:-0}"
developer0ba09b62023-03-10 18:43:49 +0800370+
371+ local ref="$(cat /sys/class/ieee80211/${phy}/macaddress)"
developer0ba09b62023-03-10 18:43:49 +0800372+
373+ if [ -z "$transmitted_bssid" ]; then
374+ transmitted_bssid=$ref
375+ fi
376+
377+ if [ $id -eq 0 ]; then
378+ echo "$transmitted_bssid"
379+ return
380+ fi
381+
382+ local oIFS="$IFS"; IFS=":"; set -- $transmitted_bssid; IFS="$oIFS"
383+
384+ # Calculate nontransmitted bssid
developer0ba09b62023-03-10 18:43:49 +0800385+ b6="0x$6"
386+ ref_b6=$(($b6 % $max_mbssid))
developer1952bcd2023-06-20 20:14:37 +0800387+ b6=$(($b6 - $ref_b6 + ($ref_b6 + $id) % $max_mbssid))
developer0ba09b62023-03-10 18:43:49 +0800388+ printf "%s:%s:%s:%s:%s:%02x" $1 $2 $3 $4 $5 $b6
389+}
390+
391 mac80211_get_addr() {
392 local phy="$1"
393 local idx="$(($2 + 1))"
developerda1bac72023-09-19 10:32:47 +0800394@@ -757,7 +893,19 @@ mac80211_prepare_vif() {
developer0ba09b62023-03-10 18:43:49 +0800395
396 json_select ..
397
398- if [ -z "$macaddr" ]; then
developerd2fbd572023-06-19 19:48:25 +0800399+ if [ "$mbssid" -gt 0 ] && [ "$mode" == "ap" ]; then
developer1952bcd2023-06-20 20:14:37 +0800400+ [ "$mbssidx" -eq 0 ] && {
401+ if [ -z $macaddr ]; then
402+ transmitted_bssid="$(mac80211_generate_mac $phy)"
403+ else
404+ # uci set mac address
405+ transmitted_bssid=$macaddr
406+ fi
407+ macidx="$(($macidx + 1))"
developer0ba09b62023-03-10 18:43:49 +0800408+ }
409+ macaddr="$(mac80211_generate_mbssid_mac $phy $transmitted_bssid)"
developer1952bcd2023-06-20 20:14:37 +0800410+ mbssidx="$(($mbssidx + 1))"
developer0ba09b62023-03-10 18:43:49 +0800411+ elif [ -z "$macaddr" ]; then
412 macaddr="$(mac80211_generate_mac $phy)"
413 macidx="$(($macidx + 1))"
414 elif [ "$macaddr" = 'random' ]; then
developerda1bac72023-09-19 10:32:47 +0800415@@ -1058,6 +1206,9 @@ mac80211_setup_vif() {
developerf0de14b2022-12-14 23:07:34 +0800416
417 json_select ..
418 [ -n "$failed" ] || wireless_add_vif "$name" "$ifname"
419+
420+ echo "Setup SMP Affinity"
421+ /sbin/smp-mt76.sh
422 }
423
424 get_freq() {
developer6cfee682023-11-27 19:34:42 +0800425@@ -1122,6 +1273,25 @@ drv_mac80211_cleanup() {
developer0ba09b62023-03-10 18:43:49 +0800426 hostapd_common_cleanup
427 }
428
429+mac80211_count_ap() {
430+ total_num_ap=$(($total_num_ap + 1))
431+}
432+
developer6cfee682023-11-27 19:34:42 +0800433+country_consistent_check() {
434+ local i
435+ inconsistent_country=0
436+ country_list="$(cat /etc/config/wireless | grep country | cut -d ' ' -f3 | tr -s "'\n" ' ')"
437+ for i in $country_list
438+ do
439+ ret="$(echo $country_list | awk '{print ($2 == "" || $1 == $2)}')"
440+ [ $ret = '0' ] && {
441+ inconsistent_country=1
442+ return
443+ }
444+ country_list="$(echo $country_list | sed -r 's/[A-Z]{2}( )*//')"
445+ done
446+}
447+
developer0ba09b62023-03-10 18:43:49 +0800448 drv_mac80211_setup() {
449 json_select config
450 json_get_vars \
developer6cfee682023-11-27 19:34:42 +0800451@@ -1129,7 +1299,8 @@ drv_mac80211_setup() {
developer74503112023-06-29 17:34:49 +0800452 country chanbw distance \
453 txpower antenna_gain \
454 rxantenna txantenna \
455- frag rts beacon_int:100 htmode
456+ frag rts beacon_int:100 htmode \
457+ sr_enable sr_enhanced
458 json_get_values basic_rate_list basic_rate
459 json_get_values scan_list scan_list
460 json_select ..
developer6cfee682023-11-27 19:34:42 +0800461@@ -1180,6 +1351,7 @@ drv_mac80211_setup() {
developer1952bcd2023-06-20 20:14:37 +0800462 no_ap=1
463 macidx=0
464 staidx=0
465+ mbssidx=0
466
467 [ -n "$chanbw" ] && {
468 for file in /sys/kernel/debug/ieee80211/$phy/ath9k*/chanbw /sys/kernel/debug/ieee80211/$phy/ath5k/bwmode; do
developer6cfee682023-11-27 19:34:42 +0800469@@ -1219,6 +1391,16 @@ drv_mac80211_setup() {
developer0ba09b62023-03-10 18:43:49 +0800470 for_each_interface "sta adhoc mesh" mac80211_set_noscan
471 [ -n "$has_ap" ] && mac80211_hostapd_setup_base "$phy"
472
473+ total_num_ap=0
474+ max_mbssid=1
475+ for_each_interface "ap" mac80211_count_ap
476+ total_num_ap=$(($total_num_ap - 1))
477+ while [ $total_num_ap -gt 0 ]
478+ do
479+ total_num_ap=$(($total_num_ap >> 1))
480+ max_mbssid=$(($max_mbssid << 1))
481+ done
482+
483 mac80211_prepare_iw_htmode
484 for_each_interface "sta adhoc mesh monitor" mac80211_prepare_vif
485 NEWAPLIST=
developer6cfee682023-11-27 19:34:42 +0800486@@ -1249,8 +1431,22 @@ drv_mac80211_setup() {
487 }
488 fi
developerad1f3172023-05-02 11:10:08 +0800489 if [ "$no_reload" != "0" ]; then
developer6cfee682023-11-27 19:34:42 +0800490+ country_consistent_check
491+ if [ "$inconsistent_country" == "1" ]; then
492+ echo "ERROR: Please use the same country for all the radios."
493+ wireless_setup_failed HOSTAPD_START_FAILED
494+ return
495+ fi
developerad1f3172023-05-02 11:10:08 +0800496 add_ap=1
497 ubus wait_for hostapd
498+
499+ # each phy sleeps different times to prevent for ubus race condition.
500+ if [ "$phy" = "phy1" ]; then
501+ sleep 1;
502+ elif [ "$phy" = "phy2" ]; then
503+ sleep 2;
504+ fi
505+
506 local hostapd_res="$(ubus call hostapd config_add "{\"iface\":\"$primary_ap\", \"config\":\"${hostapd_conf_file}\"}")"
507 ret="$?"
508 [ "$ret" != 0 -o -z "$hostapd_res" ] && {
developer6cfee682023-11-27 19:34:42 +0800509@@ -1266,6 +1462,9 @@ drv_mac80211_setup() {
developer74503112023-06-29 17:34:49 +0800510 [ "${add_ap}" = 1 ] && sleep 1
511 for_each_interface "ap" mac80211_setup_vif
512
513+ [ -n "$sr_enable" ] && echo "$sr_enable" > /sys/kernel/debug/ieee80211/$phy/mt76/sr_enable
514+ [ -n "$sr_enhanced" ] && echo "$sr_enhanced" > /sys/kernel/debug/ieee80211/$phy/mt76/sr_enhanced_enable
515+
516 NEWSPLIST=
517 NEWUMLIST=
518
developer9b3248d2022-07-06 00:44:05 +0800519diff --git a/package/kernel/mac80211/files/lib/wifi/mac80211.sh b/package/kernel/mac80211/files/lib/wifi/mac80211.sh
developerf7aff422023-11-14 11:11:34 +0800520index 3ecd932..e8c7743 100644
developere2597ba2022-06-24 13:09:16 +0800521--- a/package/kernel/mac80211/files/lib/wifi/mac80211.sh
522+++ b/package/kernel/mac80211/files/lib/wifi/mac80211.sh
developer20ce7bd2023-05-20 13:25:14 +0800523@@ -60,6 +60,9 @@ BEGIN {
developer785b6502023-04-19 18:31:11 +0800524 if (vht && band != "1:") mode="VHT80"
525 if (he) mode="HE80"
526 if (he && band == "1:") mode="HE20"
developer20ce7bd2023-05-20 13:25:14 +0800527+ if (eht && band == "2:") mode="EHT160"
528+ if (eht && band == "4:") mode="EHT320"
developer785b6502023-04-19 18:31:11 +0800529+ if (eht && band == "1:") mode="EHT20"
530 sub("\\[", "", channel)
531 sub("\\]", "", channel)
532 bands = bands band channel ":" mode " "
developer20ce7bd2023-05-20 13:25:14 +0800533@@ -73,6 +76,7 @@ $1 == "Band" {
developer785b6502023-04-19 18:31:11 +0800534 vht = ""
535 ht = ""
536 he = ""
537+ eht = ""
538 }
539
540 $0 ~ "Capabilities:" {
developer20ce7bd2023-05-20 13:25:14 +0800541@@ -87,6 +91,18 @@ $0 ~ "HE Iftypes" {
developer785b6502023-04-19 18:31:11 +0800542 he=1
543 }
544
545+$0 ~ "EHT Iftypes" {
546+ eht=1
547+}
548+
developer20ce7bd2023-05-20 13:25:14 +0800549+$0 ~ / *HE MAC Capabilities \(0x000000000000\)/ {
550+ he=0
551+}
552+
553+$0 ~ / *EHT MAC Capabilities \(0x0000\)/ {
554+ eht=0
555+}
556+
developer785b6502023-04-19 18:31:11 +0800557 $1 == "*" && $3 == "MHz" && $0 !~ /disabled/ && band && !channel {
558 channel = $4
559 }
developerf7aff422023-11-14 11:11:34 +0800560@@ -120,6 +136,20 @@ get_band_defaults() {
developere2597ba2022-06-24 13:09:16 +0800561 mode_band="$band"
562 channel="$chan"
563 htmode="$mode"
564+ if [ "$band" = "6g" ]
565+ then
566+ encryption=sae
567+ key=12345678
developer20ce7bd2023-05-20 13:25:14 +0800568+ sae_pwe=2
569+ ieee80211w=2
developeradbb45b2023-06-09 14:43:01 +0800570+ channel=37
571+ mbssid=1
developerf7aff422023-11-14 11:11:34 +0800572+ mbo=1
developere2597ba2022-06-24 13:09:16 +0800573+ else
developer659b07e2023-05-25 12:34:13 +0800574+ noscan=1
developere2597ba2022-06-24 13:09:16 +0800575+ encryption=none
developer2c6592a2023-07-21 11:20:56 +0800576+ rnr=1
developere2597ba2022-06-24 13:09:16 +0800577+ fi
578 done
579 }
580
developerf7aff422023-11-14 11:11:34 +0800581@@ -153,6 +183,10 @@ detect_mac80211() {
developer785b6502023-04-19 18:31:11 +0800582
583 json_load_file /etc/board.json
584
585+ # generate random bytes for macaddr
586+ rand=$(hexdump -C /dev/urandom | head -n 1 &)
587+ killall hexdump
588+
589 for _dev in /sys/class/ieee80211/*; do
590 [ -e "$_dev" ] || continue
591
developerf7aff422023-11-14 11:11:34 +0800592@@ -162,6 +196,13 @@ detect_mac80211() {
developere2597ba2022-06-24 13:09:16 +0800593 channel=""
594 htmode=""
595 ht_capab=""
596+ encryption=""
developer659b07e2023-05-25 12:34:13 +0800597+ noscan=""
developere2597ba2022-06-24 13:09:16 +0800598+ key=""
developer09257932023-05-09 13:41:30 +0800599+ sae_pwe=""
developer20ce7bd2023-05-20 13:25:14 +0800600+ ieee80211w=""
developeradbb45b2023-06-09 14:43:01 +0800601+ mbssid=""
developer2c6592a2023-07-21 11:20:56 +0800602+ rnr=""
developere2597ba2022-06-24 13:09:16 +0800603
604 get_band_defaults "$dev"
605
developerf7aff422023-11-14 11:11:34 +0800606@@ -192,6 +233,14 @@ detect_mac80211() {
developer785b6502023-04-19 18:31:11 +0800607 ;;
608 esac
609
developer212c0d82023-07-13 19:41:47 +0800610+ macaddr=""
developer1325ba72023-06-26 13:43:31 +0800611+ if (dmesg | grep -q "eeprom load fail"); then
developer1952bcd2023-06-20 20:14:37 +0800612+ for i in $(seq 2 3); do
613+ macaddr=${macaddr}:$(echo $rand | cut -d ' ' -f $i)
614+ done
615+ macaddr="00:0$(($devidx - 1)):55:66${macaddr}"
developer1952bcd2023-06-20 20:14:37 +0800616+ fi
developer785b6502023-04-19 18:31:11 +0800617+
618 uci -q batch <<-EOF
619 set wireless.${name}=wifi-device
620 set wireless.${name}.type=mac80211
developerf7aff422023-11-14 11:11:34 +0800621@@ -199,15 +248,43 @@ detect_mac80211() {
developer09257932023-05-09 13:41:30 +0800622 set wireless.${name}.channel=${channel}
623 set wireless.${name}.band=${mode_band}
624 set wireless.${name}.htmode=$htmode
625- set wireless.${name}.disabled=1
developer20ce7bd2023-05-20 13:25:14 +0800626+ set wireless.${name}.country='US'
developer659b07e2023-05-25 12:34:13 +0800627+ set wireless.${name}.noscan=${noscan}
developer09257932023-05-09 13:41:30 +0800628+ set wireless.${name}.disabled=0
developeradbb45b2023-06-09 14:43:01 +0800629+EOF
630+ [ -n "$mbssid" ] && {
631+ uci -q set wireless.${name}.mbssid=${mbssid}
632+ }
developer2c6592a2023-07-21 11:20:56 +0800633+ [ -n "$rnr" ] && {
634+ uci -q set wireless.${name}.rnr=${rnr}
635+ }
developer09257932023-05-09 13:41:30 +0800636
developeradbb45b2023-06-09 14:43:01 +0800637+ uci -q batch <<-EOF
developer09257932023-05-09 13:41:30 +0800638 set wireless.default_${name}=wifi-iface
639 set wireless.default_${name}.device=${name}
developer8d77be32022-10-20 15:08:25 +0800640 set wireless.default_${name}.network=lan
641 set wireless.default_${name}.mode=ap
developer09257932023-05-09 13:41:30 +0800642- set wireless.default_${name}.ssid=OpenWrt
developer8d77be32022-10-20 15:08:25 +0800643- set wireless.default_${name}.encryption=none
developer09257932023-05-09 13:41:30 +0800644+ set wireless.default_${name}.ssid=OpenWrt-${mode_band}
developer8d77be32022-10-20 15:08:25 +0800645+ set wireless.default_${name}.encryption=${encryption}
developere2597ba2022-06-24 13:09:16 +0800646 EOF
developer212c0d82023-07-13 19:41:47 +0800647+
648+ # calibrated board will use eeprom macaddress, not ramdom address
649+ [ -n "$macaddr" ] && {
650+ uci -q set wireless.default_${name}.macaddr=${macaddr}
651+ }
652+
developere2597ba2022-06-24 13:09:16 +0800653+ [ -n "$key" ] && {
developer8d77be32022-10-20 15:08:25 +0800654+ uci -q set wireless.default_${name}.key=${key}
developere2597ba2022-06-24 13:09:16 +0800655+ }
developer09257932023-05-09 13:41:30 +0800656+ [ -n "$sae_pwe" ] && {
657+ uci -q set wireless.default_${name}.sae_pwe=${sae_pwe}
658+ }
developer20ce7bd2023-05-20 13:25:14 +0800659+ [ -n "$ieee80211w" ] && {
660+ uci -q set wireless.default_${name}.ieee80211w=${ieee80211w}
661+ }
developerf7aff422023-11-14 11:11:34 +0800662+ [ -n "$mbo" ] && {
663+ uci -q set wireless.default_${name}.mbo=${mbo}
664+ }
developere2597ba2022-06-24 13:09:16 +0800665 uci -q commit wireless
developer8d77be32022-10-20 15:08:25 +0800666 done
667 }
developer85839fe2023-02-23 10:32:51 +0800668diff --git a/package/network/services/hostapd/files/hostapd.sh b/package/network/services/hostapd/files/hostapd.sh
developer945ed992023-10-25 15:01:32 +0800669index 28bd210..3bdf3c0 100644
developer85839fe2023-02-23 10:32:51 +0800670--- a/package/network/services/hostapd/files/hostapd.sh
671+++ b/package/network/services/hostapd/files/hostapd.sh
developer74503112023-06-29 17:34:49 +0800672@@ -60,7 +60,14 @@ hostapd_append_wpa_key_mgmt() {
673 [ "${ieee80211w:-0}" -gt 0 ] && append wpa_key_mgmt "WPA-EAP-SHA256"
674 ;;
675 sae)
676- append wpa_key_mgmt "SAE"
677+ case "$encryption" in
678+ *sae-ext*)
679+ append wpa_key_mgmt "SAE-EXT-KEY"
680+ ;;
681+ *)
682+ append wpa_key_mgmt "SAE"
683+ ;;
684+ esac
685 [ "${ieee80211r:-0}" -gt 0 ] && append wpa_key_mgmt "FT-SAE"
686 ;;
687 psk-sae)
688@@ -115,6 +122,7 @@ hostapd_common_add_device_config() {
689 config_add_int rts_threshold
690 config_add_int rssi_reject_assoc_rssi
691 config_add_int rssi_ignore_probe_request
692+ config_add_int rssi_reject_assoc_timeout
693 config_add_int maxassoc
694
695 config_add_string acs_chan_bias
developer5ad89862023-08-24 08:17:27 +0800696@@ -225,8 +233,10 @@ hostapd_prepare_device_config() {
developer74503112023-06-29 17:34:49 +0800697 hostapd_add_rate brlist "$br"
698 done
699
700+ json_get_vars rssi_reject_assoc_timeout
701 [ -n "$rssi_reject_assoc_rssi" ] && append base_cfg "rssi_reject_assoc_rssi=$rssi_reject_assoc_rssi" "$N"
702 [ -n "$rssi_ignore_probe_request" ] && append base_cfg "rssi_ignore_probe_request=$rssi_ignore_probe_request" "$N"
703+ [ -n "$rssi_reject_assoc_timeout" ] && append base_cfg "rssi_reject_assoc_timeout=$rssi_reject_assoc_timeout" "$N"
704 [ -n "$beacon_rate" ] && append base_cfg "beacon_rate=$beacon_rate" "$N"
705 [ -n "$rlist" ] && append base_cfg "supported_rates=$rlist" "$N"
706 [ -n "$brlist" ] && append base_cfg "basic_rates=$brlist" "$N"
developer5ad89862023-08-24 08:17:27 +0800707@@ -376,6 +386,24 @@ hostapd_common_add_bss_config() {
developer82408892023-03-27 15:09:00 +0800708 config_add_string fils_dhcp
709
710 config_add_int ocv
711+
712+ config_add_int disable_eht
713+ config_add_int disable_he
714+ config_add_int disable_vht
715+ config_add_int disable_ht
developer813f5d72023-03-28 17:44:38 +0800716+
developerf166f542023-05-25 14:40:30 +0800717+ config_add_boolean beacon_prot interworking
developer74503112023-06-29 17:34:49 +0800718+
719+ config_add_int unsol_bcast_probe_resp_interval
720+ config_add_int fils_discovery_min_interval
721+ config_add_int fils_discovery_max_interval
722+ config_add_boolean rnr
723+
724+ config_add_array sae_groups
725+ config_add_array owe_groups
726+ config_add_array pairwise
727+ config_add_string group_cipher
728+
developer82408892023-03-27 15:09:00 +0800729 }
730
731 hostapd_set_vlan_file() {
developer5ad89862023-08-24 08:17:27 +0800732@@ -440,11 +468,11 @@ append_iw_nai_realm() {
developerf166f542023-05-25 14:40:30 +0800733 }
734
735 append_iw_venue_name() {
736- append bss_conf "venue_name=$1" "$N"
737+ [ -n "$1" ] && append bss_conf "venue_name=$1" "$N"
738 }
739
740 append_iw_venue_url() {
741- append bss_conf "venue_url=$1" "$N"
742+ [ -n "$1" ] && append bss_conf "venue_url=$1" "$N"
743 }
744
745 append_hs20_oper_friendly_name() {
developer5ad89862023-08-24 08:17:27 +0800746@@ -562,7 +590,8 @@ hostapd_set_bss_options() {
developer74503112023-06-29 17:34:49 +0800747 ppsk airtime_bss_weight airtime_bss_limit airtime_sta_weight \
748 multicast_to_unicast_all proxy_arp per_sta_vif \
749 eap_server eap_user_file ca_cert server_cert private_key private_key_passwd server_id \
750- vendor_elements fils ocv
751+ vendor_elements fils ocv unsol_bcast_probe_resp_interval fils_discovery_min_interval \
752+ fils_discovery_max_interval rnr group_cipher
753
754 set_default fils 0
755 set_default isolate 0
developer945ed992023-10-25 15:01:32 +0800756@@ -790,6 +819,36 @@ hostapd_set_bss_options() {
developer74503112023-06-29 17:34:49 +0800757 local auth_algs="$((($auth_mode_shared << 1) | $auth_mode_open))"
758 append bss_conf "auth_algs=${auth_algs:-1}" "$N"
759 append bss_conf "wpa=$wpa" "$N"
760+
761+ json_get_values pairwise pairwise
developer945ed992023-10-25 15:01:32 +0800762+ json_get_vars group_cipher
developer9097e5e2023-07-19 10:22:24 +0800763+ if [ -n "$pairwise" ]; then
764+ case "$pairwise" in
765+ *tkip+aes|*tkip+ccmp|*aes+tkip|*ccmp+tkip)
766+ wpa_cipher="CCMP TKIP"
767+ ;;
768+ *ccmp256)
769+ wpa_cipher="CCMP-256"
770+ ;;
771+ *aes|*ccmp)
772+ wpa_cipher="CCMP"
773+ ;;
774+ *tkip)
775+ wpa_cipher="TKIP"
776+ ;;
777+ *gcmp256)
778+ wpa_cipher="GCMP-256"
779+ ;;
780+ *gcmp)
781+ wpa_cipher="GCMP"
782+ ;;
783+ *)
784+ wpa_cipher=""
785+ ;;
786+ esac
787+ fi
developer74503112023-06-29 17:34:49 +0800788+ [ -n "$wpa_cipher" ] && wpa_pairwise="$wpa_cipher"
789+
790 [ -n "$wpa_pairwise" ] && append bss_conf "wpa_pairwise=$wpa_pairwise" "$N"
791
792 set_default wps_pushbutton 0
developer945ed992023-10-25 15:01:32 +0800793@@ -841,7 +900,7 @@ hostapd_set_bss_options() {
developerda723192023-05-22 19:46:10 +0800794 }
795
796 append bss_conf "ssid=$ssid" "$N"
797- [ -n "$network_bridge" ] && append bss_conf "bridge=$network_bridge${N}wds_bridge=" "$N"
798+ [ -n "$network_bridge" ] && append bss_conf "bridge=$network_bridge${N}wds_bridge=$network_bridge" "$N"
799 [ -n "$network_ifname" ] && append bss_conf "snoop_iface=$network_ifname" "$N"
800 [ -n "$iapp_interface" ] && {
801 local ifname
developer945ed992023-10-25 15:01:32 +0800802@@ -954,6 +1013,8 @@ hostapd_set_bss_options() {
developer74503112023-06-29 17:34:49 +0800803 fi
804
805 if [ "$wpa" -ge "2" ]; then
806+ json_get_values sae_groups sae_groups
807+ json_get_values owe_groups owe_groups
808 if [ -n "$network_bridge" -a "$rsn_preauth" = 1 ]; then
809 set_default auth_cache 1
810 append bss_conf "rsn_preauth=1" "$N"
developer945ed992023-10-25 15:01:32 +0800811@@ -972,17 +1033,42 @@ hostapd_set_bss_options() {
developer74503112023-06-29 17:34:49 +0800812 append bss_conf "okc=$auth_cache" "$N"
813 [ "$auth_cache" = 0 -a "$fils" = 0 ] && append bss_conf "disable_pmksa_caching=1" "$N"
814
815+ [ -z "$group_cipher" ] && group_cipher="$wpa_cipher"
816+
817+ if [ -n "$sae_groups" -o -n "$owe_groups" ]; then
818+ case "$auth_type" in
819+ sae*)
820+ append bss_conf "sae_groups=$sae_groups" "$N"
821+ append bss_conf "group_cipher=$group_cipher" "$N"
822+ ;;
823+ owe)
824+ append bss_conf "owe_groups=$owe_groups" "$N"
825+ append bss_conf "group_cipher=$group_cipher" "$N"
826+ ;;
827+ esac
828+ fi
829+
developer813f5d72023-03-28 17:44:38 +0800830 # RSN -> allow management frame protection
831 case "$ieee80211w" in
832 [012])
833- json_get_vars ieee80211w_mgmt_cipher ieee80211w_max_timeout ieee80211w_retry_timeout
834+ json_get_vars ieee80211w_mgmt_cipher ieee80211w_max_timeout ieee80211w_retry_timeout beacon_prot
835 append bss_conf "ieee80211w=$ieee80211w" "$N"
836 [ "$ieee80211w" -gt "0" ] && {
developer74503112023-06-29 17:34:49 +0800837+ case "$group_cipher" in
838+ CCMP*)
839+ ieee80211w_mgmt_cipher="AES-128-CMAC"
840+ ;;
841+ GCMP-256)
842+ [[ "$encryption" != "*owe*" ]] && ieee80211w_mgmt_cipher="BIP-GMAC-256"
843+ ;;
844+ esac
developer813f5d72023-03-28 17:44:38 +0800845 if [ "$auth_type" = "eap192" ]; then
developer74503112023-06-29 17:34:49 +0800846 append bss_conf "group_mgmt_cipher=BIP-GMAC-256" "$N"
developer813f5d72023-03-28 17:44:38 +0800847 else
848 append bss_conf "group_mgmt_cipher=${ieee80211w_mgmt_cipher:-AES-128-CMAC}" "$N"
849 fi
850+ [ -n "$beacon_prot" ] && \
851+ append bss_conf "beacon_prot=$beacon_prot" "$N"
852 [ -n "$ieee80211w_max_timeout" ] && \
853 append bss_conf "assoc_sa_query_max_timeout=$ieee80211w_max_timeout" "$N"
854 [ -n "$ieee80211w_retry_timeout" ] && \
developer945ed992023-10-25 15:01:32 +0800855@@ -1047,9 +1133,10 @@ hostapd_set_bss_options() {
developerf166f542023-05-25 14:40:30 +0800856 json_get_vars iw_roaming_consortium iw_domain_name iw_anqp_3gpp_cell_net iw_nai_realm
857 json_get_vars iw_anqp_elem iw_qos_map_set iw_ipaddr_type_availability iw_gas_address3
858 json_get_vars iw_venue_name iw_venue_url
859+ json_get_vars interworking
860
861 set_default iw_enabled 0
862- if [ "$iw_enabled" = "1" ]; then
863+ if [ "$iw_enabled" = "1" ] || [ "$interworking" = "1" ]; then
864 append bss_conf "interworking=1" "$N"
865 set_default iw_internet 1
866 set_default iw_asra 0
developer945ed992023-10-25 15:01:32 +0800867@@ -1156,6 +1243,22 @@ hostapd_set_bss_options() {
developer74503112023-06-29 17:34:49 +0800868 append bss_conf "$val" "$N"
869 done
870
871+ if [ "$unsol_bcast_probe_resp_interval" -gt 0 ]; then
872+ append bss_conf "unsol_bcast_probe_resp_interval=$unsol_bcast_probe_resp_interval" "$N"
873+ fi
874+
875+ if [ -n "$fils_discovery_min_interval" ]; then
876+ append bss_conf "fils_discovery_min_interval=$fils_discovery_min_interval" "$N"
877+ fi
878+
879+ if [ -n "$fils_discovery_max_interval" ]; then
880+ append bss_conf "fils_discovery_max_interval=$fils_discovery_max_interval" "$N"
881+ fi
882+
883+ if [ -n "$rnr" ]; then
884+ append bss_conf "rnr=$rnr" "$N"
885+ fi
886+
887 bss_md5sum="$(echo $bss_conf | md5sum | cut -d" " -f1)"
888 append bss_conf "config_id=$bss_md5sum" "$N"
889
developer945ed992023-10-25 15:01:32 +0800890@@ -1246,6 +1349,7 @@ wpa_supplicant_prepare_interface() {
developer18015ad2023-07-13 13:18:19 +0800891 country_str="country=$country"
892 }
893
developer2cf3f4c2023-07-24 16:58:25 +0800894+ local tx_queue_data2_burst="tx_queue_data2_burst=0"
developer18015ad2023-07-13 13:18:19 +0800895 multiap_flag_file="${_config}.is_multiap"
896 if [ "$multi_ap" = "1" ]; then
897 touch "$multiap_flag_file"
developer945ed992023-10-25 15:01:32 +0800898@@ -1257,6 +1361,7 @@ wpa_supplicant_prepare_interface() {
developer18015ad2023-07-13 13:18:19 +0800899 ${scan_list:+freq_list=$scan_list}
900 $ap_scan
901 $country_str
902+$tx_queue_data2_burst
903 EOF
904 return 0
905 }
developer945ed992023-10-25 15:01:32 +0800906@@ -1528,12 +1633,39 @@ wpa_supplicant_add_network() {
developer74503112023-06-29 17:34:49 +0800907 ;;
908 esac
909
developerbb29b5e2023-07-25 20:41:04 +0800910- [ "$wpa_cipher" = GCMP ] && {
911- append network_data "pairwise=GCMP" "$N$T"
912- append network_data "group=GCMP" "$N$T"
913- }
developer74503112023-06-29 17:34:49 +0800914+ json_get_values pairwise pairwise
developer945ed992023-10-25 15:01:32 +0800915+ json_get_vars group_cipher
developer9097e5e2023-07-19 10:22:24 +0800916+ if [ -n "$pairwise" ]; then
917+ case "$pairwise" in
918+ *tkip+aes|*tkip+ccmp|*aes+tkip|*ccmp+tkip)
919+ wpa_cipher="CCMP TKIP"
920+ ;;
921+ *ccmp256)
922+ wpa_cipher="CCMP-256"
923+ ;;
924+ *aes|*ccmp)
925+ wpa_cipher="CCMP"
926+ ;;
927+ *tkip)
928+ wpa_cipher="TKIP"
929+ ;;
930+ *gcmp256)
931+ wpa_cipher="GCMP-256"
932+ ;;
933+ *gcmp)
934+ wpa_cipher="GCMP"
935+ ;;
936+ *)
937+ wpa_cipher=""
938+ ;;
939+ esac
940+ fi
developer74503112023-06-29 17:34:49 +0800941+ [ -n "$wpa_cipher" ] && wpa_pairwise="$wpa_cipher"
developer74503112023-06-29 17:34:49 +0800942
943 [ "$mode" = mesh ] || {
944+ json_get_values sae_groups sae_groups
945+ json_get_values owe_groups owe_groups
946+
947 case "$wpa" in
948 1)
949 append network_data "proto=WPA" "$N$T"
developer945ed992023-10-25 15:01:32 +0800950@@ -1543,12 +1675,48 @@ wpa_supplicant_add_network() {
developer74503112023-06-29 17:34:49 +0800951 ;;
952 esac
953
954+ [ -n "$wpa_pairwise" ] && append network_data "pairwise=$wpa_pairwise" "$N$T"
955+ [ -z "$group_cipher" ] && group_cipher="$wpa_cipher"
956+
957+ if [ -n "$sae_groups" -o -n "$owe_groups" ]; then
958+ case "$auth_type" in
959+ sae*)
960+ echo "sae_groups=$sae_groups" >> "$_config"
961+ append network_data "group=$group_cipher" "$N$T"
962+ ;;
963+ owe)
964+ append network_data "owe_group=$owe_groups" "$N$T"
965+ append network_data "group=$group_cipher" "$N$T"
966+ ;;
967+ esac
968+ fi
969+
970+ # RSN -> allow management frame protection
971 case "$ieee80211w" in
972 [012])
973- [ "$wpa" -ge 2 ] && append network_data "ieee80211w=$ieee80211w" "$N$T"
974+ json_get_vars ieee80211w_mgmt_cipher ieee80211w_max_timeout ieee80211w_retry_timeout beacon_prot
975+ append network_data "ieee80211w=$ieee80211w" "$N$T"
976+ [ "$ieee80211w" -gt "0" ] && {
977+ case "$group_cipher" in
978+ CCMP*)
979+ ieee80211w_mgmt_cipher="AES-128-CMAC"
980+ ;;
981+ GCMP-256)
982+ [[ "$encryption" != "*owe*" ]] && ieee80211w_mgmt_cipher="BIP-GMAC-256"
983+ ;;
984+ esac
985+ if [ "$auth_type" = "eap192" ]; then
986+ append network_data "group_mgmt=BIP-GMAC-256" "$N$T"
987+ else
988+ append network_data "group_mgmt=${ieee80211w_mgmt_cipher:-AES-128-CMAC}" "$N$T"
989+ fi
990+ [ -n "$beacon_prot" ] && \
991+ append network_data "beacon_prot=$beacon_prot" "$N$T"
992+ }
993 ;;
994 esac
995 }
996+
997 [ -n "$bssid" ] && append network_data "bssid=$bssid" "$N$T"
998 [ -n "$beacon_int" ] && append network_data "beacon_int=$beacon_int" "$N$T"
999
developer945ed992023-10-25 15:01:32 +08001000@@ -1559,6 +1727,20 @@ wpa_supplicant_add_network() {
developer82408892023-03-27 15:09:00 +08001001 [ -n "$bssid_blacklist" ] && append network_data "bssid_blacklist=$bssid_blacklist" "$N$T"
1002 [ -n "$bssid_whitelist" ] && append network_data "bssid_whitelist=$bssid_whitelist" "$N$T"
1003
1004+ local disable_eht
1005+ local disable_he
1006+ local disable_vht
1007+ local disable_ht
1008+ json_get_vars disable_eht
1009+ json_get_vars disable_he
1010+ json_get_vars disable_vht
1011+ json_get_vars disable_ht
1012+
1013+ [ -n "$disable_eht" ] && append network_data "disable_eht=$disable_eht" "$N$T"
1014+ [ -n "$disable_he" ] && append network_data "disable_he=$disable_he" "$N$T"
1015+ [ -n "$disable_vht" ] && append network_data "disable_vht=$disable_vht" "$N$T"
1016+ [ -n "$disable_ht" ] && append network_data "disable_ht=$disable_ht" "$N$T"
1017+
1018 [ -n "$basic_rate" ] && {
1019 local br rate_list=
1020 for br in $basic_rate; do
developer945ed992023-10-25 15:01:32 +08001021@@ -1573,6 +1755,11 @@ wpa_supplicant_add_network() {
developer85839fe2023-02-23 10:32:51 +08001022 append network_data "mcast_rate=$mc_rate" "$N$T"
1023 }
1024
1025+ if [ "$auth_type" = "sae" ]; then
1026+ json_get_vars sae_pwe sae_pwe
1027+ [ -n "$sae_pwe" ] && echo "sae_pwe=$sae_pwe" >> "$_config"
1028+ fi
1029+
1030 if [ "$key_mgmt" = "WPS" ]; then
1031 echo "wps_cred_processing=1" >> "$_config"
1032 else