scottk/wlan-ap
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-ap.git synced 2025-10-28 17:12:22 +00:00
Code Issues Packages Projects Releases 10 Wiki Activity

23.05: update to latest HEAD

Browse Source 
Signed-off-by: John Crispin <john@phrozen.org>
This commit is contained in:
John Crispin
2023-09-19 07:16:25 +02:00
parent 539e288247
commit 79d5972643
9 changed files with 36 additions and 109645 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config.yml
View File

@@ -1,6 +1,6 @@
repo: https://github.com/openwrt/openwrt.git
branch: openwrt-23.05
revision: cdc8470aecd03e6994714af092f030f209951de4
revision: 8b385a45a65cb4721e6bb2fbb24ce080417e331f
output_dir: ./output
patch_folders:

144
patches/0044-netifd-update-to-latest-HEAD.patch
View File

@@ -1,144 +0,0 @@
From 5287669135980433cbcd1064c950aeca19f6f82c Mon Sep 17 00:00:00 2001
From: John Crispin <john@phrozen.org>
Date: Fri, 28 Jul 2023 16:50:08 +0200
Subject: [PATCH] netifd: update to latest HEAD
Signed-off-by: John Crispin <john@phrozen.org>
---
package/network/config/netifd/Makefile | 13 ++--
.../etc/hotplug.d/net/20-smp-packet-steering | 67 +++++++++++++++++++
.../netifd/patches/200-psk-radius.patch | 12 ++++
3 files changed, 86 insertions(+), 6 deletions(-)
create mode 100644 package/network/config/netifd/files/etc/hotplug.d/net/20-smp-packet-steering
create mode 100644 package/network/config/netifd/patches/200-psk-radius.patch
diff --git a/package/network/config/netifd/Makefile b/package/network/config/netifd/Makefile
index 31fd0838a4..f749d72eb9 100644
--- a/package/network/config/netifd/Makefile
+++ b/package/network/config/netifd/Makefile
@@ -5,16 +5,14 @@ PKG_RELEASE:=1
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL=$(PROJECT_GIT)/project/netifd.git
-PKG_SOURCE_DATE:=2023-06-04
-PKG_SOURCE_VERSION:=ec9dba72124597b7224bbfe75960386dc320f4bd
-PKG_MIRROR_HASH:=baee39a3882a2b03fc83a3a6a8963c340fa8d884c7a8c9e80e7d2dddc50e24bd
+PKG_SOURCE_DATE:=2023-08-31
+PKG_SOURCE_VERSION:=1a07f1dff32b3af49e39533e33e8964b59535662
+PKG_MIRROR_HASH:=dc621dd04c3c9631002f929cf10a4620f57af8b0baf614c590bda17957fa6201
PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
PKG_LICENSE:=GPL-2.0
PKG_LICENSE_FILES:=
-PKG_BUILD_FLAGS:=lto
-
include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/cmake.mk
@@ -32,7 +30,10 @@ endef
TARGET_CFLAGS += \
-I$(STAGING_DIR)/usr/include/libnl-tiny \
- -I$(STAGING_DIR)/usr/include
+ -I$(STAGING_DIR)/usr/include \
+ -flto
+
+TARGET_LDFLAGS += -flto -fuse-linker-plugin
CMAKE_OPTIONS += \
-DLIBNL_LIBS=-lnl-tiny \
diff --git a/package/network/config/netifd/files/etc/hotplug.d/net/20-smp-packet-steering b/package/network/config/netifd/files/etc/hotplug.d/net/20-smp-packet-steering
new file mode 100644
index 0000000000..8a86bf75f6
--- /dev/null
+++ b/package/network/config/netifd/files/etc/hotplug.d/net/20-smp-packet-steering
@@ -0,0 +1,67 @@
+#!/bin/sh
+[ "$ACTION" = add ] || exit
+
+NPROCS="$(grep -c "^processor.*:" /proc/cpuinfo)"
+[ "$NPROCS" -gt 1 ] || exit
+
+PROC_MASK="$(( (1 << $NPROCS) - 1 ))"
+
+find_irq_cpu() {
+ local dev="$1"
+ local match="$(grep -m 1 "$dev\$" /proc/interrupts)"
+ local cpu=0
+
+ [ -n "$match" ] && {
+ set -- $match
+ shift
+ for cur in $(seq 1 $NPROCS); do
+ [ "$1" -gt 0 ] && {
+ cpu=$(($cur - 1))
+ break
+ }
+ shift
+ done
+ }
+
+ echo "$cpu"
+}
+
+set_hex_val() {
+ local file="$1"
+ local val="$2"
+ val="$(printf %x "$val")"
+ [ -n "$DEBUG" ] && echo "$file = $val"
+ echo "$val" > "$file"
+}
+
+packet_steering="$(uci get "network.@globals[0].packet_steering")"
+[ "$packet_steering" != 1 ] && exit 0
+
+exec 512>/var/lock/smp_tune.lock
+flock 512 || exit 1
+
+for dev in /sys/class/net/*; do
+ [ -d "$dev" ] || continue
+
+ # ignore virtual interfaces
+ [ -n "$(ls "${dev}/" | grep '^lower_')" ] && continue
+ [ -d "${dev}/device" ] || continue
+
+ device="$(readlink "${dev}/device")"
+ device="$(basename "$device")"
+ irq_cpu="$(find_irq_cpu "$device")"
+ irq_cpu_mask="$((1 << $irq_cpu))"
+
+ for q in ${dev}/queues/tx-*; do
+ set_hex_val "$q/xps_cpus" "$PROC_MASK"
+ done
+
+ # ignore dsa slave ports for RPS
+ subsys="$(readlink "${dev}/device/subsystem")"
+ subsys="$(basename "$subsys")"
+ [ "$subsys" = "mdio_bus" ] && continue
+
+ for q in ${dev}/queues/rx-*; do
+ set_hex_val "$q/rps_cpus" "$PROC_MASK"
+ done
+done
diff --git a/package/network/config/netifd/patches/200-psk-radius.patch b/package/network/config/netifd/patches/200-psk-radius.patch
new file mode 100644
index 0000000000..cc1e7021c9
--- /dev/null
+++ b/package/network/config/netifd/patches/200-psk-radius.patch
@@ -0,0 +1,12 @@
+--- a/scripts/netifd-wireless.sh
++++ b/scripts/netifd-wireless.sh
+@@ -260,6 +260,9 @@ wireless_vif_parse_encryption() {
+ wpa3*)
+ auth_type=eap256
+ ;;
++ psk2-radius*)
++ auth_type=psk2-radius
++ ;;
+ psk3-mixed*|sae-mixed*)
+ auth_type=psk-sae
+ ;;
--
2.34.1

30
patches/0047-ucode-update-to-latest-HEAD.patch
View File

@@ -1,30 +0,0 @@
From 8c587aa5eb6ec68769846cdcc68d44e4c629a981 Mon Sep 17 00:00:00 2001
From: John Crispin <john@phrozen.org>
Date: Fri, 1 Sep 2023 11:01:47 +0200
Subject: [PATCH] ucode: update to latest HEAD
Signed-off-by: John Crispin <john@phrozen.org>
---
package/utils/ucode/Makefile | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/package/utils/ucode/Makefile b/package/utils/ucode/Makefile
index e3a33410c2..c77da85349 100644
--- a/package/utils/ucode/Makefile
+++ b/package/utils/ucode/Makefile
@@ -12,9 +12,9 @@ PKG_RELEASE:=1
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL=https://github.com/jow-/ucode.git
-PKG_SOURCE_DATE:=2023-04-03
-PKG_SOURCE_VERSION:=5163867269fc04fa01ec5e9f8df3384c933339f2
-PKG_MIRROR_HASH:=e82922ff59d6f899d9434bf79f2e6e4add0b7b0466355755fc83d4b5a0aeebfb
+PKG_SOURCE_DATE:=2023-06-06
+PKG_SOURCE_VERSION:=c7d84aae09691a99ae3db427c0b2463732ef84f4
+PKG_MIRROR_HASH:=38826ae70d886d1d7ada3fc6591ac807169aa28107f60f7f2e617520083525fb
PKG_MAINTAINER:=Jo-Philipp Wich <jo@mein.io>
PKG_LICENSE:=ISC
--
2.34.1

23882
patches/0048-hostapd-drop-current-version.patch
View File

File diff suppressed because it is too large Load Diff

26625
patches/0049-hostapd-add-upstream-version.patch
View File

File diff suppressed because it is too large Load Diff

29225
patches/0052-mac80211-drop-23.05-version.patch
View File

File diff suppressed because it is too large Load Diff

29739
patches/0053-mac80211-update-to-HEAD.patch
View File

File diff suppressed because it is too large Load Diff

26
patches/0054-mac80211-drop-hostapd-dependency.patch
View File

@@ -1,26 +0,0 @@
From d8d0935355a83ea46437d5c145d4c55067d2db00 Mon Sep 17 00:00:00 2001
From: John Crispin <john@phrozen.org>
Date: Fri, 18 Aug 2023 08:37:27 +0200
Subject: [PATCH 54/55] mac80211: drop hostapd dependency
Signed-off-by: John Crispin <john@phrozen.org>
---
package/kernel/mac80211/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package/kernel/mac80211/Makefile b/package/kernel/mac80211/Makefile
index a7472ee779..1cd537b140 100644
--- a/package/kernel/mac80211/Makefile
+++ b/package/kernel/mac80211/Makefile
@@ -121,7 +121,7 @@ define KernelPackage/mac80211
$(call KernelPackage/mac80211/Default)
TITLE:=Linux 802.11 Wireless Networking Stack
# +kmod-crypto-cmac is a runtime only dependency of net/mac80211/aes_cmac.c
- DEPENDS+= +kmod-cfg80211 +kmod-crypto-cmac +kmod-crypto-ccm +kmod-crypto-gcm +hostapd-common
+ DEPENDS+= +kmod-cfg80211 +kmod-crypto-cmac +kmod-crypto-ccm +kmod-crypto-gcm
KCONFIG:=\
CONFIG_AVERAGE=y
FILES:= $(PKG_BUILD_DIR)/net/mac80211/mac80211.ko
--
2.34.1

8
patches/0056-ipq40xx-remove-23.05-version-of-the-target.patch
View File

@@ -1,6 +1,6 @@
From e17d18a7872779d67633a74905ba4ca97571aad8 Mon Sep 17 00:00:00 2001
From a467e92b85d4a1f11614af82a4bd9078fcfa84bc Mon Sep 17 00:00:00 2001
From: John Crispin <john@phrozen.org>
Date: Thu, 7 Sep 2023 05:55:04 +0200
Date: Tue, 19 Sep 2023 06:47:20 +0200
Subject: [PATCH] ipq40xx: drop upstream target
Signed-off-by: John Crispin <john@phrozen.org>
@@ -32226,7 +32226,7 @@ index f6ac69ecf1..0000000000
-TARGET_DEVICES += google_wifi
diff --git a/target/linux/ipq40xx/image/generic.mk b/target/linux/ipq40xx/image/generic.mk
deleted file mode 100644
index 7f4806b63d..0000000000
index 08cbd63b3c..0000000000
--- a/target/linux/ipq40xx/image/generic.mk
+++ /dev/null
@@ -1,1234 +0,0 @@
@@ -33404,7 +33404,7 @@ index 7f4806b63d..0000000000
-# exploit for the web interface
- IMAGES += factory.bin recovery.bin
- IMAGE/factory.bin := append-ubi
- IMAGE/recovery.bin := append-squashfs4-fakeroot | sysupgrade-tar kernel=$$$$(BIN_DIR)/openwrt-$$(BOARD)$$(if $$(SUBTARGET),-$$(SUBTARGET))-$$(DEVICE_NAME)-initramfs-zImage.itb rootfs=$$$$@ | append-metadata
- IMAGE/recovery.bin := append-squashfs4-fakeroot | sysupgrade-tar kernel=$$$$(BIN_DIR)/$$(KERNEL_INITRAMFS_IMAGE) rootfs=$$$$@ | append-metadata
-endef
-
-define Device/zte_mf287plus