Skip to content

Commit ebd55bb

Browse files
small-white-rabbitsmall-white-rabbit
authored
Merge branch 'openwrt:main' into wax206
2 parents c2fd165 + 2f6a467 commit ebd55bb

24 files changed

Lines changed: 128 additions & 243 deletions

File tree

‎package/kernel/linux/modules/netdevices.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -567,7 +567,7 @@ define KernelPackage/phy-aeonsemi-as21xxx
567567
AUTOLOAD:=$(call AutoLoad,18,as21xxx)
568568
endef
569569

570-
define KernelPackage/phy-aeonsemi-as21x1x/description
570+
define KernelPackage/phy-aeonsemi-as21xxx/description
571571
Kernel modules for Aeonsemi AS21x1x 10G Ethernet PHY
572572
endef
573573

‎package/network/config/wifi-scripts/files-ucode/lib/netifd/wireless/mac80211.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -250,6 +250,7 @@ function setup() {
250250
break;
251251
// fallthrough
252252
case 'sta':
253+
data.ap_start_disabled = true;
253254
let config = supplicant.generate(supplicant_data, data, v);
254255
if (mode == "mesh")
255256
config_add_mesh_params(config, v.config);

‎package/network/config/wifi-scripts/files-ucode/usr/share/schema/wireless.wifi-iface.json‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1077,15 +1077,6 @@
10771077
"description": "If bridge parameter is set, the WDS STA interface will be added to the same bridge by default",
10781078
"type": "boolean"
10791079
},
1080-
"wmm": {
1081-
"type": "alias",
1082-
"default": "wmm_enabled"
1083-
},
1084-
"wmm_enabled": {
1085-
"description": "Default WMM parameters (IEEE 802.11 draft; 11-03-0504-03-000e)",
1086-
"type": "boolean",
1087-
"default": true
1088-
},
10891080
"wnm_sleep_mode": {
10901081
"description": "WNM-Sleep Mode (extended sleep mode for stations)",
10911082
"type": "boolean"

‎package/network/config/wifi-scripts/files-ucode/usr/share/ucode/wifi/ap.uc‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ function iface_setup(config) {
4545

4646
append('bssid', config.macaddr);
4747
config.ssid2 = config.ssid;
48+
config.wmm_enabled = 1;
4849
append_string_vars(config, [ 'ssid2' ]);
4950

5051
append_vars(config, [
@@ -53,9 +54,9 @@ function iface_setup(config) {
5354
'disassoc_low_ack', 'skip_inactivity_poll', 'ignore_broadcast_ssid', 'uapsd_advertisement_enabled',
5455
'utf8_ssid', 'multi_ap', 'tdls_prohibit', 'bridge', 'wds_sta', 'wds_bridge',
5556
'snoop_iface', 'vendor_elements', 'nas_identifier', 'radius_acct_interim_interval',
56-
'ocv', 'multicast_to_unicast', 'preamble', 'wmm_enabled', 'proxy_arp', 'per_sta_vif', 'mbo',
57+
'ocv', 'multicast_to_unicast', 'preamble', 'proxy_arp', 'per_sta_vif', 'mbo',
5758
'bss_transition', 'wnm_sleep_mode', 'wnm_sleep_mode_no_keys', 'qos_map_set', 'max_listen_int',
58-
'dtim_period',
59+
'dtim_period', 'wmm_enabled', 'start_disabled',
5960
]);
6061
}
6162

@@ -433,6 +434,7 @@ export function generate(interface, data, config, vlans, stas, phy_features) {
433434

434435
iface_stations(config, stas);
435436

437+
config.start_disabled = data.ap_start_disabled;
436438
iface_setup(config);
437439

438440
iface.parse_encryption(config, data.config);

‎package/network/config/wifi-scripts/files/lib/netifd/hostapd.sh‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ EOF
273273

274274
hostapd_common_add_bss_config() {
275275
config_add_string 'bssid:macaddr' 'ssid:string'
276-
config_add_boolean wds wmm uapsd hidden utf8_ssid ppsk
276+
config_add_boolean wds uapsd hidden utf8_ssid ppsk
277277

278278
config_add_int maxassoc max_inactivity
279279
config_add_boolean disassoc_low_ack isolate short_preamble skip_inactivity_poll
@@ -546,7 +546,7 @@ hostapd_set_bss_options() {
546546
maxassoc max_inactivity disassoc_low_ack isolate auth_cache \
547547
wps_pushbutton wps_label ext_registrar wps_pbc_in_m1 wps_ap_setup_locked \
548548
wps_independent wps_device_type wps_device_name wps_manufacturer wps_pin \
549-
macfilter ssid utf8_ssid wmm uapsd hidden short_preamble rsn_preauth \
549+
macfilter ssid utf8_ssid uapsd hidden short_preamble rsn_preauth \
550550
iapp_interface eapol_version dynamic_vlan ieee80211w nasid \
551551
acct_secret acct_port acct_interval \
552552
bss_load_update_period chan_util_avg_period sae_require_mfp sae_pwe \
@@ -565,7 +565,6 @@ hostapd_set_bss_options() {
565565
set_default disassoc_low_ack 1
566566
set_default skip_inactivity_poll 0
567567
set_default hidden 0
568-
set_default wmm 1
569568
set_default uapsd 1
570569
set_default wpa_disable_eapol_key_retries 0
571570
set_default tdls_prohibit 0
@@ -603,7 +602,7 @@ hostapd_set_bss_options() {
603602
append bss_conf "disassoc_low_ack=$disassoc_low_ack" "$N"
604603
append bss_conf "skip_inactivity_poll=$skip_inactivity_poll" "$N"
605604
append bss_conf "preamble=$short_preamble" "$N"
606-
append bss_conf "wmm_enabled=$wmm" "$N"
605+
append bss_conf "wmm_enabled=1" "$N"
607606
append bss_conf "ignore_broadcast_ssid=$hidden" "$N"
608607
append bss_conf "uapsd_advertisement_enabled=$uapsd" "$N"
609608
append bss_conf "utf8_ssid=$utf8_ssid" "$N"

‎package/network/services/hostapd/files/hostapd.uc‎

Lines changed: 44 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -778,7 +778,7 @@ function bss_check_mld(phydev, iface_name, bss)
778778
bss.mld_bssid = mld_data.macaddr;
779779
mld_data.iface[iface_name] = true;
780780

781-
if (!access('/sys/class/net/' + iface_name, 'x'))
781+
if (!access('/sys/class/net/' + bss.ifname, 'x'))
782782
mld_data.has_wdev = false;
783783

784784
if (mld_data.has_wdev)
@@ -1166,20 +1166,22 @@ let main_obj = {
11661166
return 0;
11671167
}
11681168

1169-
if (!req.args.frequency)
1170-
return libubus.STATUS_INVALID_ARGUMENT;
1171-
1172-
let freq_info = iface_freq_info(iface, config, req.args);
1173-
if (!freq_info)
1174-
return libubus.STATUS_UNKNOWN_ERROR;
1175-
1176-
let ret;
1177-
if (req.args.csa) {
1178-
freq_info.csa_count = req.args.csa_count ?? 10;
1179-
ret = iface.switch_channel(freq_info);
1180-
} else {
1181-
ret = iface.start(freq_info);
1169+
let freq_info;
1170+
if (req.args.frequency) {
1171+
freq_info = iface_freq_info(iface, config, req.args);
1172+
if (!freq_info)
1173+
return libubus.STATUS_UNKNOWN_ERROR;
1174+
1175+
if (req.args.csa) {
1176+
freq_info.csa_count = req.args.csa_count ?? 10;
1177+
let ret = iface.switch_channel(freq_info);
1178+
if (!ret)
1179+
return libubus.STATUS_UNKNOWN_ERROR;
1180+
return 0;
1181+
}
11821182
}
1183+
1184+
let ret = iface.start(freq_info);
11831185
if (!ret)
11841186
return libubus.STATUS_UNKNOWN_ERROR;
11851187

@@ -1208,6 +1210,34 @@ let main_obj = {
12081210
return ret;
12091211
}
12101212
},
1213+
switch_channel: {
1214+
args: {
1215+
phy: "",
1216+
radio: 0,
1217+
csa_count: 0,
1218+
sec_channel: 0,
1219+
oper_chwidth: 0,
1220+
frequency: 0,
1221+
center_freq1: 0,
1222+
center_freq2: 0,
1223+
},
1224+
call: function(req) {
1225+
let phy = phy_name(req.args.phy, req.args.radio);
1226+
if (!req.args.frequency || !phy)
1227+
return libubus.STATUS_INVALID_ARGUMENT;
1228+
1229+
let iface = hostapd.interfaces[phy];
1230+
if (!iface)
1231+
return libubus.STATUS_NOT_FOUND;
1232+
1233+
req.args.csa_count ??= 10;
1234+
let ret = iface.switch_channel(req.args);
1235+
if (!ret)
1236+
return libubus.STATUS_UNKNOWN_ERROR;
1237+
1238+
return 0;
1239+
},
1240+
},
12111241
mld_set: {
12121242
args: {
12131243
config: {}

‎package/network/services/hostapd/files/wpa_supplicant.uc‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -303,6 +303,9 @@ function mld_update_phy(phy, ifaces) {
303303
}
304304

305305
function mld_start() {
306+
if (wpas.data.mld_pending)
307+
return;
308+
306309
wpas.printf(`Start pending MLD interfaces\n`);
307310

308311
let phy_list = {};
@@ -501,13 +504,15 @@ let main_obj = {
501504
if (!req.args.config)
502505
return libubus.STATUS_INVALID_ARGUMENT;
503506

507+
wpas.data.mld_pending = true;
504508
mld_set_config(req.args.config);
505509
return 0;
506510
}
507511
},
508512
mld_start: {
509513
args: {},
510514
call: function(req) {
515+
wpas.data.mld_pending = false;
511516
mld_start();
512517
return 0;
513518
}

‎package/network/services/hostapd/src/src/ap/ucode.c‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -582,10 +582,8 @@ uc_hostapd_iface_start(uc_vm_t *vm, size_t nargs)
582582
if (!iface)
583583
return NULL;
584584

585-
if (!info) {
586-
iface->freq = 0;
585+
if (!info)
587586
goto out;
588-
}
589587

590588
if (ucv_type(info) != UC_OBJECT)
591589
return NULL;

‎package/network/utils/iwinfo/Makefile‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ define Package/iwinfo
6363
SECTION:=utils
6464
CATEGORY:=Utilities
6565
TITLE:=Generalized Wireless Information utility
66-
DEPENDS:=+libiwinfo @!WIFI_SCRIPTS_UCODE
66+
DEPENDS:=+@!WIFI_SCRIPTS_UCODE:libiwinfo
6767
endef
6868

6969
define Package/iwinfo/description
@@ -111,10 +111,16 @@ define Package/libiwinfo-data/install
111111
$(INSTALL_DATA) $(PKG_BUILD_DIR)/devices.txt $(1)/usr/share/libiwinfo/devices.txt
112112
endef
113113

114-
define Package/iwinfo/install
114+
ifdef CONFIG_WIFI_SCRIPTS_UCODE
115+
define Package/iwinfo/install
116+
:
117+
endef
118+
else
119+
define Package/iwinfo/install
115120
$(INSTALL_DIR) $(1)/usr/bin
116121
$(INSTALL_BIN) $(PKG_BUILD_DIR)/iwinfo $(1)/usr/bin/iwinfo
117-
endef
122+
endef
123+
endif
118124

119125
$(eval $(call BuildPackage,libiwinfo))
120126
$(eval $(call BuildPackage,libiwinfo-lua))

‎package/utils/ucode/Makefile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ PKG_RELEASE:=1
1212

1313
PKG_SOURCE_PROTO:=git
1414
PKG_SOURCE_URL=https://github.com/jow-/ucode.git
15-
PKG_SOURCE_DATE:=2025-08-26
16-
PKG_SOURCE_VERSION:=5f712ffd3f31f13ed4812cfb37c21dbef7a75e2b
17-
PKG_MIRROR_HASH:=6093ceb320854f4d38180f163fd702bceb8785ed6574aa145021eda82a9cf7b4
15+
PKG_SOURCE_DATE:=2025-09-29
16+
PKG_SOURCE_VERSION:=1090abb125490d2f541f68453cc251daf94f8b04
17+
PKG_MIRROR_HASH:=b68d893867add47b92d519a631c4e3bacec52eafae088b6a64ba3935f169bb15
1818
PKG_MAINTAINER:=Jo-Philipp Wich <jo@mein.io>
1919
PKG_LICENSE:=ISC
2020

0 commit comments

Comments
 (0)