Nanako/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge Official Source

Browse Source 
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
This commit is contained in:
Tianling Shen 2025-02-15 00:47:46 +08:00
commit 3a5b87680f
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
15 changed files with 38 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package/base-files/files/lib/functions/caldata.sh
View File

@ -125,8 +125,8 @@ caldata_valid() {
caldata_patch_data() {
local data=$1
local data_count=$((${#1} / 2))
local data_offset=$(($2))
local chksum_offset=$(($3))
[ -n "$2" ] && local data_offset=$(($2))
[ -n "$3" ] && local chksum_offset=$(($3))
local target=$4
local fw_data
local fw_chksum

1
package/boot/uboot-envtools/files/realtek
View File

@ -28,6 +28,7 @@ zyxel,gs1900-10hp|\
zyxel,gs1900-16|\
zyxel,gs1900-24-v1|\
zyxel,gs1900-24e|\
zyxel,gs1900-24ep|\
zyxel,gs1900-24hp-v1|\
zyxel,gs1900-24hp-v2)
idx="$(find_mtd_index u-boot-env)"

2
package/kernel/mac80211/patches/rt2x00/602-01-wifi-rt2x00-Add-support-for-loading-EEPROM-from-user.patch
View File

@ -151,7 +151,7 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
+ }
+
+ if (!ee_name)
+ return 0;
+ return -ENOENT;
+
+ rt2x00_info(rt2x00dev, "Loading EEPROM data from '%s'.\n", ee_name);
+

6
package/kernel/mt76/Makefile
View File

@ -8,9 +8,9 @@ PKG_LICENSE_FILES:=
PKG_SOURCE_URL:=https://github.com/openwrt/mt76
PKG_SOURCE_PROTO:=git
PKG_SOURCE_DATE:=2025-01-22
PKG_SOURCE_VERSION:=a22d59e4ad50c89326342a0736cd2c1ba32e8a0b
PKG_MIRROR_HASH:=e8bbbada2171ea31a6788e3e46e81c409a9fe038eefe4b41f541da848a1b1bcd
PKG_SOURCE_DATE:=2025-02-14
PKG_SOURCE_VERSION:=e5fef138524e63314cb96ff8314048d175294e95
PKG_MIRROR_HASH:=4d6ea8669b3034c97f5b341a5473facf4fe21262a2fde71257b57c4d1c86be5e
PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
PKG_USE_NINJA:=0

15
package/network/services/hostapd/patches/601-ucode_support.patch
View File

@ -816,7 +816,7 @@ as adding/removing interfaces.
if (vlan_id)
*vlan_id = 0;
if (psk_len)
@@ -446,13 +447,16 @@ static const u8 * hostapd_wpa_auth_get_p
@@ -446,13 +447,18 @@ static const u8 * hostapd_wpa_auth_get_p
* returned psk which should not be returned again.
* logic list (all hostapd_get_psk; all sta->psk)
*/
@ -830,16 +830,23 @@ as adding/removing interfaces.
*vlan_id = 0;
psk = sta->psk->psk;
- for (pos = sta->psk; pos; pos = pos->next) {
+ if (vlan_id)
+ sta->psk_idx = psk_idx;
+ for (pos = sta->psk; pos; pos = pos->next, psk_idx++) {
if (pos->is_passphrase) {
if (pbkdf2_sha1(pos->passphrase,
hapd->conf->ssid.ssid,
@@ -469,6 +473,8 @@ static const u8 * hostapd_wpa_auth_get_p
@@ -466,9 +472,13 @@ static const u8 * hostapd_wpa_auth_get_p
}
if (pos->psk == prev_psk) {
psk = pos->next ? pos->next->psk : NULL;
+ if (vlan_id)
+ sta->psk_idx = psk_idx + 1;
break;
}
}
+ if (psk)
+ sta->psk_idx = psk_idx;
+ if (vlan_id && !psk)
+ sta->psk_idx = 0;
}
return psk;
}

2
package/network/services/hostapd/patches/730-ft_iface.patch
View File

@ -29,7 +29,7 @@ a VLAN interface on top of the bridge, instead of using the bridge directly
int bridge_hairpin; /* hairpin_mode on bridge members */
--- a/src/ap/wpa_auth_glue.c
+++ b/src/ap/wpa_auth_glue.c
@@ -1821,8 +1821,12 @@ int hostapd_setup_wpa(struct hostapd_dat
@@ -1825,8 +1825,12 @@ int hostapd_setup_wpa(struct hostapd_dat
wpa_key_mgmt_ft(hapd->conf->wpa_key_mgmt)) {
const char *ft_iface;

2
package/network/services/hostapd/patches/803-hostapd-fix-80211be-build.patch
View File

@ -25,7 +25,7 @@
+
--- a/src/ap/sta_info.h
+++ b/src/ap/sta_info.h
@@ -409,23 +409,8 @@ int ap_sta_re_add(struct hostapd_data *h
@@ -408,23 +408,8 @@ int ap_sta_re_add(struct hostapd_data *h
void ap_free_sta_pasn(struct hostapd_data *hapd, struct sta_info *sta);

4
target/linux/ath79/dts/ar9342_mikrotik_routerboard-911g-xhpnd.dts
View File

@ -9,3 +9,7 @@
compatible = "mikrotik,routerboard-911g-xhpnd", "qca,ar9342";
model = "MikroTik RouterBOARD 911G-(2,5)HPnD";
};
&ref {
clock-frequency = <25000000>;
};

4
target/linux/ath79/dts/ar9342_mikrotik_routerboard-911g.dtsi
View File

@ -146,10 +146,6 @@
};
};
&ref {
clock-frequency = <40000000>;
};
&spi {
status = "okay";

4
target/linux/ath79/dts/ar9342_mikrotik_routerboard-912uag-2hpnd.dts
View File

@ -10,6 +10,10 @@
model = "MikroTik RouterBOARD 912UAG-(2,5)HPnD";
};
&ref {
clock-frequency = <40000000>;
};
&pcie {
status = "okay";
};

4
target/linux/mediatek/dts/mt7986a-zyxel-ex5601-t0-stock.dts
View File

@ -11,8 +11,8 @@
#include <dt-bindings/input/input.h>
/ {
model = "Zyxel EX5601-T0";
compatible = "zyxel,ex5601-t0", "mediatek,mt7986a-rfb-snand";
model = "Zyxel EX5601-T0 (stock layout)";
compatible = "zyxel,ex5601-t0-stock", "mediatek,mt7986a";
memory@40000000 {
device_type = "memory";

2
target/linux/mediatek/filogic/base-files/etc/board.d/01_leds
View File

@ -137,7 +137,7 @@ xiaomi,redmi-router-ax6000-ubootmod)
zbtlink,zbt-z8103ax)
ucidef_set_led_netdev "wan" "wan" "green:wan" "eth1" "link tx rx"
;;
zyxel_ex5601-t0-stock|\
zyxel,ex5601-t0-stock|\
zyxel,ex5601-t0-ubootmod)
ucidef_set_led_netdev "lan" "LAN" "green:lan" "eth0" "link tx rx"
ucidef_set_led_netdev "wan" "WAN" "green:inet" "eth1" "link tx rx"

2
target/linux/mediatek/filogic/base-files/etc/hotplug.d/ieee80211/11_fix_wifi_mac
View File

@ -152,7 +152,7 @@ case "$board" in
routerich,ax3000-ubootmod|\
zbtlink,zbt-z8102ax|\
zbtlink,zbt-z8103ax|\
zyxel,ex5601-t0|\
zyxel,ex5601-t0-stock|\
zyxel,ex5601-t0-ubootmod)
addr=$(mtd_get_mac_binary "Factory" 0x4)
[ "$PHYNBR" = "1" ] && macaddr_add $addr 1 > /sys${DEVPATH}/macaddress

4
target/linux/ramips/dts/mt7620a_linksys_e1700.dts
View File

@ -167,6 +167,10 @@
};
&wmac {
pinctrl-names = "default", "pa_gpio";
pinctrl-0 = <&pa_pins>;
pinctrl-1 = <&pa_gpio_pins>;
nvmem-cells = <&eeprom_factory_0>;
nvmem-cell-names = "eeprom";
};

4
target/linux/ramips/mt7620/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom
View File

@ -34,12 +34,12 @@ case "$FIRMWARE" in
wan_mac=$(jboot_config_read -m -i $(find_mtd_part "config") -o 0xE000)
wifi_mac=$(macaddr_add "$wan_mac" 1)
jboot_eeprom_extract "config" 0xE000
caldata_patch_mac $wifi_mac 0x4
caldata_patch_data "${wifi_mac//:/}" 0x4
;;
dovado,tiny-ac)
wifi_mac=$(mtd_get_mac_ascii u-boot-env INIC_MAC_ADDR)
caldata_extract "factory" 0x0 0x200
caldata_patch_mac $wifi_mac 0x4
caldata_patch_data "${wifi_mac//:/}" 0x4
;;
*)
caldata_die "Please define mtd-eeprom in $board DTS file!"