[][MAC80211][misc][Change the default value of AP]
[Description]
Change some default values
1. Set 6G channel to 37
2. Enable MBSSID at 6 GHz
3. Enable OFDMA UL
[Release-log]
N/A
Change-Id: Ib691b5b712531da23e28d7dac986cdbf686b4802
Reviewed-on: https://gerrit.mediatek.inc/c/openwrt/feeds/mtk_openwrt_feeds/+/7608324
diff --git a/autobuild_mac80211_release/0001-master-mac80211-generate-hostapd-setting-from-ap-cap.patch b/autobuild_mac80211_release/0001-master-mac80211-generate-hostapd-setting-from-ap-cap.patch
index f08cfd7..076d971 100644
--- a/autobuild_mac80211_release/0001-master-mac80211-generate-hostapd-setting-from-ap-cap.patch
+++ b/autobuild_mac80211_release/0001-master-mac80211-generate-hostapd-setting-from-ap-cap.patch
@@ -470,7 +470,7 @@
$1 == "*" && $3 == "MHz" && $0 !~ /disabled/ && band && !channel {
channel = $4
}
-@@ -120,6 +136,16 @@ get_band_defaults() {
+@@ -120,6 +136,18 @@ get_band_defaults() {
mode_band="$band"
channel="$chan"
htmode="$mode"
@@ -480,6 +480,8 @@
+ key=12345678
+ sae_pwe=2
+ ieee80211w=2
++ channel=37
++ mbssid=1
+ else
+ noscan=1
+ encryption=none
@@ -487,7 +489,7 @@
done
}
-@@ -153,6 +179,10 @@ detect_mac80211() {
+@@ -153,6 +181,10 @@ detect_mac80211() {
json_load_file /etc/board.json
@@ -498,7 +500,7 @@
for _dev in /sys/class/ieee80211/*; do
[ -e "$_dev" ] || continue
-@@ -162,6 +192,11 @@ detect_mac80211() {
+@@ -162,6 +194,12 @@ detect_mac80211() {
channel=""
htmode=""
ht_capab=""
@@ -507,10 +509,11 @@
+ key=""
+ sae_pwe=""
+ ieee80211w=""
++ mbssid=""
get_band_defaults "$dev"
-@@ -196,6 +231,11 @@ detect_mac80211() {
+@@ -196,6 +234,11 @@ detect_mac80211() {
;;
esac
@@ -522,7 +525,7 @@
uci -q batch <<-EOF
set wireless.${name}=wifi-device
set wireless.${name}.type=mac80211
-@@ -203,15 +243,29 @@ detect_mac80211() {
+@@ -203,15 +246,34 @@ detect_mac80211() {
set wireless.${name}.channel=${channel}
set wireless.${name}.band=${mode_band}
set wireless.${name}.htmode=$htmode
@@ -530,7 +533,12 @@
+ set wireless.${name}.country='US'
+ set wireless.${name}.noscan=${noscan}
+ set wireless.${name}.disabled=0
++EOF
++ [ -n "$mbssid" ] && {
++ uci -q set wireless.${name}.mbssid=${mbssid}
++ }
++ uci -q batch <<-EOF
set wireless.default_${name}=wifi-iface
set wireless.default_${name}.device=${name}
set wireless.default_${name}.network=lan
diff --git a/autobuild_mac80211_release/package/network/services/hostapd_new/patches/mtk-0006-hostapd-mtk-Add-hostapd-MU-SET-GET-control.patch b/autobuild_mac80211_release/package/network/services/hostapd_new/patches/mtk-0006-hostapd-mtk-Add-hostapd-MU-SET-GET-control.patch
index a79555a..0892d3f 100644
--- a/autobuild_mac80211_release/package/network/services/hostapd_new/patches/mtk-0006-hostapd-mtk-Add-hostapd-MU-SET-GET-control.patch
+++ b/autobuild_mac80211_release/package/network/services/hostapd_new/patches/mtk-0006-hostapd-mtk-Add-hostapd-MU-SET-GET-control.patch
@@ -1,7 +1,7 @@
-From fd2df638591cc86c21153e94abe8fc00451703b8 Mon Sep 17 00:00:00 2001
+From ee34d2ccb27863f0eaa7abb0f65477ab9a0dd92f Mon Sep 17 00:00:00 2001
From: TomLiu <tomml.liu@mediatek.com>
Date: Tue, 9 Aug 2022 10:23:44 -0700
-Subject: [PATCH 06/28] hostapd: mtk: Add hostapd MU SET/GET control
+Subject: [PATCH 06/32] hostapd: mtk: Add hostapd MU SET/GET control
---
hostapd/config_file.c | 9 +++
@@ -156,14 +156,14 @@
{ "dpp_qr_code", hostapd_cli_cmd_dpp_qr_code, NULL,
"report a scanned DPP URI from a QR Code" },
diff --git a/src/ap/ap_config.c b/src/ap/ap_config.c
-index 55c35c7..1cad303 100644
+index 55c35c7..afa19ec 100644
--- a/src/ap/ap_config.c
+++ b/src/ap/ap_config.c
@@ -280,6 +280,7 @@ struct hostapd_config * hostapd_config_defaults(void)
conf->he_6ghz_max_ampdu_len_exp = 7;
conf->he_6ghz_rx_ant_pat = 1;
conf->he_6ghz_tx_ant_pat = 1;
-+ conf->mu_onoff = 13;
++ conf->mu_onoff = 15;
#endif /* CONFIG_IEEE80211AX */
/* The third octet of the country string uses an ASCII space character
@@ -446,5 +446,5 @@
}
--
-2.18.0
+2.39.0