OpenWrt/immortalwrt
1
0
Fork 0
mirror of https://github.com/immortalwrt/immortalwrt synced 2025-01-09 04:29:03 +08:00
Code Issues 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 2022-03-01 21:17:16 +08:00
commit 5fd919745d
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
5 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/network/services/hostapd/Makefile
View File

@ -7,7 +7,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=hostapd
PKG_RELEASE:=39
PKG_RELEASE:=40
PKG_SOURCE_URL:=http://w1.fi/hostap.git
PKG_SOURCE_PROTO:=git

4
package/network/services/hostapd/files/hostapd.sh
View File

@ -490,11 +490,11 @@ append_hs20_conn_capab() {
}
append_radius_acct_req_attr() {
append bss_conf "radius_acct_req_attr=$1" "$N"
[ -n "$1" ] && append bss_conf "radius_acct_req_attr=$1" "$N"
}
append_radius_auth_req_attr() {
append bss_conf "radius_auth_req_attr=$1" "$N"
[ -n "$1" ] && append bss_conf "radius_auth_req_attr=$1" "$N"
}
append_airtime_sta_weight() {

7
target/linux/ipq806x/base-files/etc/init.d/bootcount
View File

@ -2,15 +2,12 @@
START=99
. /lib/upgrade/asrock.sh
. "$IPKG_INSTROOT/lib/upgrade/asrock.sh"
boot() {
case $(board_name) in
asrock,g10)
asrock_bootconfig_mangle "bootcheck"
if [ $? -eq 0 ]; then
reboot
fi
asrock_bootconfig_mangle "bootcheck" && reboot
;;
edgecore,ecw5410)
fw_setenv bootcount 0

2
target/linux/ipq806x/base-files/lib/upgrade/asrock.sh
View File

@ -1,4 +1,4 @@
. /lib/functions.sh
. "$IPKG_INSTROOT/lib/functions.sh"
asrock_bootconfig_mangle() {
local mtdnum="$( find_mtd_index 0:BOOTCONFIG )"

2
target/linux/ramips/dts/mt7620a_iptime.dtsi
View File

@ -21,7 +21,7 @@
flash@0 {
compatible = "jedec,spi-nor";
reg = <0>;
spi-max-frequency = <50000000>;
spi-max-frequency = <40000000>;
partitions {
compatible = "fixed-partitions";