scottk/wlan-ap
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-ap.git synced 2025-10-30 01:52:51 +00:00
Code Issues Packages Projects Releases 10 Wiki Activity

ucentral: development update

Browse Source 
* update ucentral-client
* update ucentral-wifi
* update ucentral-schema
* update ucentralgw
* update udhcpsnoop
* update ath10k-ct
* add ucentral-event
* fix eap102 port mapping
* fix ratelimit

Signed-off-by: John Crispin <john@phrozen.org>
This commit is contained in:
John Crispin
2021-04-26 07:08:55 +02:00
parent ab6f671fae
commit 6a54bb6cfb
18 changed files with 194 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/build-dev.yml vendored
View File

@@ -32,7 +32,7 @@ jobs:
BRANCH=$(git rev-parse --abbrev-ref HEAD)
LOWERCASE_TARGET=`echo ${{ matrix.target }} | tr '[:upper:]' '[:lower:]'`
HASH=$(git rev-parse --short HEAD)
TAR_NAME="$LOWERCASE_TARGET-$BRANCH-$HASH.tar.gz"
TAR_NAME="$(date +%Y%m%d)-$LOWERCASE_TARGET-$BRANCH-$HASH.tar.gz"
ls openwrt/bin/targets/
tar cfz "$TAR_NAME" -C openwrt/bin/targets/ .
curl -u $GH_BUILD_USERNAME:$GH_BUILD_PASSWORD -T "$TAR_NAME" "https://tip.jfrog.io/artifactory/tip-wlan-ap-firmware/uCentral/$LOWERCASE_TARGET/"$TAR_NAME""

19
backports/0003-kernel-add-linux-5.10-support.patch
View File

@@ -1,7 +1,7 @@
From 8d2914fefae283882989fa5f0ba352fde2ac64f1 Mon Sep 17 00:00:00 2001
From 16ff9017e964d6429efeaad3e767522cb29da244 Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@nbd.name>
Date: Sat, 24 Oct 2020 21:14:16 +0200
Subject: [PATCH 3/9] kernel: add linux 5.10 support
Subject: [PATCH 01/39] kernel: add linux 5.10 support
Signed-off-by: Felix Fietkau <nbd@nbd.name>
---
@@ -49,6 +49,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
...rious-flag-to-disable-overcurrent-ch.patch | 88 +
...-platform-add-spurious_oc-DT-support.patch | 31 +
target/linux/generic/config-5.10 | 7062 +++++++++++++++++
target/linux/generic/config-5.4 | 1 +
target/linux/generic/config-filter | 6 +-
.../generic/files/block/partitions/fit.c | 254 +
.../files/drivers/mtd/mtdsplit/Kconfig | 5 +
@@ -217,7 +218,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
.../pending-5.10/834-ledtrig-libata.patch | 149 +
...40-hwrng-bcm2835-set-quality-to-1000.patch | 26 +
.../pending-5.10/920-mangle_bootargs.patch | 71 +
212 files changed, 37352 insertions(+), 54 deletions(-)
213 files changed, 37353 insertions(+), 54 deletions(-)
create mode 100644 target/linux/generic/backport-5.10/010-Kbuild-don-t-hardcode-path-to-awk-in-scripts-ld-vers.patch
create mode 100644 target/linux/generic/backport-5.10/011-kbuild-export-SUBARCH.patch
create mode 100644 target/linux/generic/backport-5.10/071-crypto-arm-chacha-neon-optimize-for-non-block-size-m.patch
@@ -12355,6 +12356,18 @@ index 0000000000..4eb5607f17
+# CONFIG_ZRAM_MEMORY_TRACKING is not set
+# CONFIG_ZSMALLOC is not set
+# CONFIG_ZX_TDM is not set
diff --git a/target/linux/generic/config-5.4 b/target/linux/generic/config-5.4
index 91dc0b0f49..d3e9325f71 100644
--- a/target/linux/generic/config-5.4
+++ b/target/linux/generic/config-5.4
@@ -3273,6 +3273,7 @@ CONFIG_MTD_ROOTFS_ROOT_DEV=y
CONFIG_MTD_SPI_NOR_USE_4K_SECTORS_LIMIT=4096
CONFIG_MTD_SPLIT=y
# CONFIG_MTD_SPLIT_BCM_WFI_FW is not set
+# CONFIG_MTD_SPLIT_BCM63XX_FW is not set
# CONFIG_MTD_SPLIT_BRNIMAGE_FW is not set
# CONFIG_MTD_SPLIT_ELF_FW is not set
# CONFIG_MTD_SPLIT_EVA_FW is not set
diff --git a/target/linux/generic/config-filter b/target/linux/generic/config-filter
index 0d53ed9c3c..7d634b56cf 100644
--- a/target/linux/generic/config-filter

28
feeds/ucentral/ratelimit/files/usr/bin/ratelimit
View File

@@ -16,7 +16,7 @@ IP() {
get_id() {
addr=$1
hashval="0x$(echo "$addr" | md5sum | head -c8)"
mask=0xfff
mask=0x4ff
echo $(($hashval & $mask))
}
@@ -30,11 +30,11 @@ delclient() {
[ -z "$id" ] && id=$(get_id ${mac//:})
TC filter del dev $iface protocol ip parent 1:0 prio 1 u32 match ether dst $mac flowid 1:$id
TC class del dev $iface parent 1: classid 1:$id
TC filter del dev $iface protocol all parent 1: prio 1 u32 match ether dst $mac flowid 1:$id
TC class del dev $iface parent 1:1 classid 1:$id
TC filter del dev $ifb protocol ip parent 1:0 prio 1 u32 match ether src $mac flowid 1:$id
TC class del dev $ifb parent 1: classid 1:$id
TC filter del dev $ifb protocol all parent 1: prio 1 u32 match ether src $mac flowid 1:$id
TC class del dev $ifb parent 1:1 classid 1:$id
}
addclient() {
@@ -58,14 +58,14 @@ addclient() {
local id=$(get_id ${mac//:})
delclient $1 $2 $id
logger "ratelimit: add new client entries for $2"
TC class add dev $iface parent 1: classid 1:$id htb rate ${egress}mbit ceil ${egress}mbit
TC filter add dev $iface protocol ip parent 1:0 prio 1 u32 match ether dst $mac flowid 1:$id
TC class add dev $iface parent 1:1 classid 1:$id htb rate 1mbit ceil ${egress}mbit burst 2k prio 1
TC qdisc add dev $iface parent 1:$id handle $id: sfq perturb 10
TC filter add dev $iface protocol all parent 1: prio 1 u32 match ether dst $mac flowid 1:$id
TC class add dev $ifb parent 1: classid 1:$id htb rate ${ingress}mbit ceil ${ingress}mbit
TC filter add dev $ifb protocol ip parent 1:0 prio 1 u32 match ether src $mac flowid 1:$id
TC class add dev $ifb parent 1:1 classid 1:$id htb rate 1mbit ceil ${ingress}mbit burst 2k prio 1
TC filter add dev $ifb protocol all parent 1: prio 1 u32 match ether src $mac flowid 1:$id
}
deliface() {
@@ -95,10 +95,10 @@ addiface() {
return 0
}
sleep 1
sleep 2
ssid=$(ubus call network.wireless status | jsonfilter -e '@[*].interfaces[@.ifname="'"$iface"'"].config.ssid')
[ -z "$ssid" ] && {
echo "ratelimit: failed to lookup ssid"
logger "ratelimit: failed to lookup ssid"
exit 1
}
@@ -113,11 +113,13 @@ addiface() {
sleep 1
TC qdisc add dev $iface root handle 1: htb default 10
TC qdisc add dev $iface root handle 1: htb default 30
TC class add dev $iface parent 1: classid 1:1 htb rate 1000mbit burst 6k
TC qdisc add dev $iface ingress
TC filter add dev $iface parent ffff: protocol all prio 10 u32 match u32 0 0 flowid 1:1 action mirred egress redirect dev $ifb
TC qdisc add dev $ifb root handle 1: htb default 10
TC class add dev $ifb parent 1: classid 1:1 htb rate 100mbit
hostapd_cli -a /usr/libexec/ratelimit.sh -i $iface -P /tmp/run/hostapd-cli-$iface.pid -B
for sta in $(ubus call wifi station | jsonfilter -e '@[*][*].mac'); do

2
feeds/ucentral/ucentral-client/Makefile
View File

@@ -6,7 +6,7 @@ PKG_RELEASE:=1
PKG_SOURCE_URL=https://github.com/blogic/ucentral-client.git
PKG_SOURCE_PROTO:=git
PKG_SOURCE_DATE:=2021-02-15
PKG_SOURCE_VERSION:=e2ed426412628155b670f5d5dafffc3e3beb4c11
PKG_SOURCE_VERSION:=5f0de40f2fcc1556ba53b05d927ddcb1f84c5713
PKG_LICENSE:=BSD-3-Clause
PKG_MAINTAINER:=John Crispin <john@phrozen.org>

11
feeds/ucentral/ucentral-client/files/etc/config/ucentral
View File

@@ -3,3 +3,14 @@ config ucentral config
option server '192.168.178.9'
option port '11783'
option reporting 10
#config event
# option type dhcp
#config event
# option type wifi
# list filter probe
# list filter assoc
# list filter auth
# list filter key-mismatch
# list filter disassoc

34
feeds/ucentral/ucentral-event/Makefile Normal file
View File

@@ -0,0 +1,34 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=ucentral-event
PKG_RELEASE:=1
PKG_SOURCE_URL=https://github.com/blogic/ucentral-event.git
PKG_SOURCE_PROTO:=git
PKG_SOURCE_DATE:=2021-04-13
PKG_SOURCE_VERSION:=cc77fd23ed6b24739976a312b709834a4d73f1bf
PKG_MAINTAINER:=John Crispin <john@phrozen.org>
PKG_LICENSE:=BSD-3-Clause
include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/cmake.mk
define Package/ucentral-event
SECTION:=ucentral
CATEGORY:=uCentral
TITLE:=uCentral event gathering daemon
DEPENDS:=+libubox +libubus +libuci +libblobmsg-json
endef
TARGET_CFLAGS += \
-I$(STAGING_DIR)/usr/include \
-I$(STAGING_DIR)/usr/include/libnl-tiny
define Package/ucentral-event/install
$(INSTALL_DIR) $(1)/usr/sbin $(1)/etc/init.d
$(INSTALL_BIN) $(PKG_BUILD_DIR)/ucentral-event $(1)/usr/sbin/
$(INSTALL_BIN) ./files/ucentral-event $(1)/etc/init.d/
endef
$(eval $(call BuildPackage,ucentral-event))

13
feeds/ucentral/ucentral-event/files/ucentral-event Normal file
View File

@@ -0,0 +1,13 @@
#!/bin/sh /etc/rc.common
START=80
USE_PROCD=1
PROG=/usr/sbin/ucentral-event
start_service() {
procd_open_instance
procd_set_param command "$PROG"
procd_set_param respawn
procd_close_instance
}

1
feeds/ucentral/ucentral-event/git-src Symbolic link
View File

@@ -0,0 +1 @@
/ucentral/ucentral-event/.git

2
feeds/ucentral/ucentral-schema/Makefile
View File

@@ -6,7 +6,7 @@ PKG_RELEASE:=1
PKG_SOURCE_URL=https://github.com/blogic/ucentral-schema.git
PKG_SOURCE_PROTO:=git
PKG_SOURCE_DATE:=2021-02-15
PKG_SOURCE_VERSION:=efefa5cd8af1329f8c78f7310e1183ac31ba0d2a
PKG_SOURCE_VERSION:=373bd335ec30162fecfda7bca016f65fa0e83825
PKG_MAINTAINER:=John Crispin <john@phrozen.org>
PKG_LICENSE:=BSD-3-Clause

2
feeds/ucentral/ucentral-wifi/Makefile
View File

@@ -6,7 +6,7 @@ PKG_RELEASE:=1
PKG_SOURCE_URL=https://github.com/blogic/ucentral-wifi.git
PKG_SOURCE_PROTO:=git
PKG_SOURCE_DATE:=2021-04-13
PKG_SOURCE_VERSION:=a601cf055673eb27a1e8dd499528e3e1921e0306
PKG_SOURCE_VERSION:=2e81fd1e6e1d5b71f576af25fcb2e1dc75f94510
PKG_MAINTAINER:=John Crispin <john@phrozen.org>
PKG_LICENSE:=BSD-3-Clause

11
feeds/ucentral/ucentralgw/Makefile
View File

@@ -6,16 +6,17 @@ PKG_RELEASE:=1
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL=git@github.com:Telecominfraproject/wlan-cloud-ucentralgw.git
PKG_SOURCE_DATE:=2021-03-28
PKG_SOURCE_VERSION:=8711011f932351dc1dc5a6d9adba9774b94503b7
PKG_SOURCE_VERSION:=4fe4a865b7ddf43991efec5fd3f21c34f89b7146
CMAKE_INSTALL:=1
PKG_LICENSE:=BSD-3-Clause
PKG_MAINTAINER:=John Crispin <john@phrozen.org>
PKG_BUILD_PARALLEL:=1
include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/cmake.mk
HOST_BUILD_PREFIX:=$(STAGING_DIR_HOST)
CMAKE_SHARED_LDFLAGS=""
define Package/ucentralgw
SECTION:=ucentral
@@ -31,10 +32,14 @@ ifeq ($(ARCH),aarch64)
CMAKE_OPTIONS+=-DCMAKE_SYSTEM_PROCESSOR=aarch64
endif
define Package/lldpd/conffiles
/etc/ucentral/
endef
define Package/ucentralgw/install
$(INSTALL_DIR) $(1)/usr/bin $(1)/usr/libexec/ucentral/
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ucentral $(1)/usr/bin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ucentralgw $(1)/usr/bin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/cert_scripts/* $(1)/usr/libexec/ucentral/
$(CP) ./files/* $(1)
endef

2
feeds/ucentral/ucentralgw/files/etc/init.d/ucentralgw
View File

@@ -3,7 +3,7 @@
START=80
USE_PROCD=1
PROG=/usr/bin/ucentral
PROG=/usr/bin/ucentralgw
start_service() {
procd_open_instance

22
feeds/ucentral/ucentralgw/patches/100-cmake.patch
View File

@@ -1,22 +0,0 @@
Index: ucentralgw-2021-03-22-220dd3aa/CMakeLists.txt
===================================================================
--- ucentralgw-2021-03-22-220dd3aa.orig/CMakeLists.txt
+++ ucentralgw-2021-03-22-220dd3aa/CMakeLists.txt
@@ -54,6 +54,10 @@ add_executable( ucentral
src/RESTAPI_default_configuration.h src/RESTAPI_default_configurations.cpp src/RESTAPI_default_configurations.h src/RESTAPI_commands.cpp
src/RESTAPI_commands.h src/uCommandManager.cpp src/uCommandManager.h src/RESTAPI_command.cpp src/RESTAPI_command.h)
+INSTALL(TARGETS ucentral
+ RUNTIME DESTINATION /usr/bin
+)
+
if(SMALL_BUILD)
target_link_libraries(ucentral PRIVATE yaml-cpp
${Poco_LIBRARIES} ${Boost_LIBRARIES} ${ZLIB_LIBRARIES})
@@ -61,4 +65,4 @@ else()
target_link_libraries(ucentral PRIVATE yaml-cpp
${Poco_LIBRARIES} ${Boost_LIBRARIES} ${PostgreSQL_LIBRARIES}
${MySQL_LIBRARIES} ${ODBC_LIBRARIES} ${ZLIB_LIBRARIES})
-endif()
\ No newline at end of file
+endif()

2
feeds/ucentral/ucode/Makefile
View File

@@ -13,7 +13,7 @@ PKG_RELEASE:=1
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL=https://github.com/jow-/ucode.git
PKG_SOURCE_DATE:=2021-03-15
PKG_SOURCE_VERSION:=7f0ff9143159cfa76408ed3dfedb2d730b17fb46
PKG_SOURCE_VERSION:=f360350bd874aeec0806c8df02c7a20a54c44406
PKG_MIRROR_HASH:=
PKG_MAINTAINER:=Jo-Philipp Wich <jo@mein.io>
PKG_LICENSE:=ISC

2
feeds/ucentral/udhcpsnoop/Makefile
View File

@@ -9,7 +9,7 @@ PKG_MAINTAINER:=John Crispin <john@phrozen.org>
PKG_SOURCE_URL=https://github.com/blogic/udhcpsnoop.git
PKG_SOURCE_PROTO:=git
PKG_SOURCE_DATE:=2021-04-12
PKG_SOURCE_VERSION:=9d4b428d96513c5b45f80d5d73ae378e074c9a9b
PKG_SOURCE_VERSION:=85ee2f9dbc08482bde88ca1a8afbc50e9ccb99db
include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/cmake.mk

26
patches/0017-ipq807x-add-the-Qualcomm-AX-target-support.patch
View File

@@ -1,7 +1,7 @@
From c9e80c840be1932cdfe41cc118d88c1fe68745e1 Mon Sep 17 00:00:00 2001
From d3299f791ac087b76556ea3d30ec153e71688634 Mon Sep 17 00:00:00 2001
From: John Crispin <john@phrozen.org>
Date: Sat, 18 Jul 2020 08:53:44 +0200
Subject: [PATCH] ipq807x: add the Qualcomm AX target support
Subject: [PATCH 25/39] ipq807x: add the Qualcomm AX target support
Signed-off-by: John Crispin <john@phrozen.org>
---
@@ -26,8 +26,8 @@ Signed-off-by: John Crispin <john@phrozen.org>
.../boot/dts/qcom-ipq6018-edgecore-eap101.dts | 18 +
.../boot/dts/qcom-ipq6018-miwifi-ax1800.dts | 18 +
.../arch/arm/boot/dts/qcom-ipq807x-eap102.dts | 26 +
.../arch/arm/boot/dts/qcom-ipq807x-ex227.dts | 26 +
.../arch/arm/boot/dts/qcom-ipq807x-ex447.dts | 26 +
.../arch/arm/boot/dts/qcom-ipq807x-ex227.dts | 26 +
.../arch/arm/boot/dts/qcom-ipq807x-ex447.dts | 26 +
.../boot/dts/qcom-ipq807x-sercomm-wallaby.dts | 26 +
.../arch/arm/boot/dts/qcom-ipq807x-wf194c.dts | 26 +
.../dts/qcom/qcom-ipq6018-miwifi-ax1800.dts | 419 +++++
@@ -277,7 +277,7 @@ index 0000000000..90df1f8a9a
+$(eval $(call BuildTarget))
diff --git a/target/linux/ipq807x/base-files/etc/board.d/01_leds b/target/linux/ipq807x/base-files/etc/board.d/01_leds
new file mode 100755
index 0000000000..9e03f179c0
index 0000000000..39f4c941c0
--- /dev/null
+++ b/target/linux/ipq807x/base-files/etc/board.d/01_leds
@@ -0,0 +1,29 @@
@@ -312,7 +312,7 @@ index 0000000000..9e03f179c0
+exit 0
diff --git a/target/linux/ipq807x/base-files/etc/board.d/02_network b/target/linux/ipq807x/base-files/etc/board.d/02_network
new file mode 100755
index 0000000000..bea114b0b6
index 0000000000..d2c7687947
--- /dev/null
+++ b/target/linux/ipq807x/base-files/etc/board.d/02_network
@@ -0,0 +1,77 @@
@@ -346,7 +346,6 @@ index 0000000000..bea114b0b6
+ ucidef_set_interface_wan "eth3"
+ ;;
+ cig,wf194c|\
+ edgecore,eap102|\
+ sercomm,wallaby)
+ ucidef_set_interface_lan "eth0"
+ ucidef_set_interface_wan "eth1"
@@ -355,6 +354,7 @@ index 0000000000..bea114b0b6
+ ucidef_set_interface_lan "eth1 eth2"
+ ucidef_set_interface_wan "eth0"
+ ;;
+ edgecore,eap102|\
+ cig,wf188n)
+ ucidef_set_interface_lan "eth1"
+ ucidef_set_interface_wan "eth0"
@@ -395,7 +395,7 @@ index 0000000000..bea114b0b6
+exit 0
diff --git a/target/linux/ipq807x/base-files/etc/hotplug.d/firmware/10-ath11k-caldata b/target/linux/ipq807x/base-files/etc/hotplug.d/firmware/10-ath11k-caldata
new file mode 100755
index 0000000000..45b90b2fd2
index 0000000000..ea23dc7a58
--- /dev/null
+++ b/target/linux/ipq807x/base-files/etc/hotplug.d/firmware/10-ath11k-caldata
@@ -0,0 +1,97 @@
@@ -4736,7 +4736,7 @@ HcmV?d00001
diff --git a/target/linux/ipq807x/base-files/lib/upgrade/platform.sh b/target/linux/ipq807x/base-files/lib/upgrade/platform.sh
new file mode 100755
index 0000000000..e7a62ae72a
index 0000000000..4fe26e9bc5
--- /dev/null
+++ b/target/linux/ipq807x/base-files/lib/upgrade/platform.sh
@@ -0,0 +1,62 @@
@@ -5759,7 +5759,7 @@ index 0000000000..d1d3f3755e
+};
diff --git a/target/linux/ipq807x/files/arch/arm/boot/dts/qcom-ipq807x-ex227.dts b/target/linux/ipq807x/files/arch/arm/boot/dts/qcom-ipq807x-ex227.dts
new file mode 100644
index 0000000000..fa9f3c604e
index 0000000000..f3b25e2633
--- /dev/null
+++ b/target/linux/ipq807x/files/arch/arm/boot/dts/qcom-ipq807x-ex227.dts
@@ -0,0 +1,26 @@
@@ -5791,7 +5791,7 @@ index 0000000000..fa9f3c604e
+};
diff --git a/target/linux/ipq807x/files/arch/arm/boot/dts/qcom-ipq807x-ex447.dts b/target/linux/ipq807x/files/arch/arm/boot/dts/qcom-ipq807x-ex447.dts
new file mode 100644
index 0000000000..9c50e0fba5
index 0000000000..7cfd66ba0a
--- /dev/null
+++ b/target/linux/ipq807x/files/arch/arm/boot/dts/qcom-ipq807x-ex447.dts
@@ -0,0 +1,26 @@
@@ -7321,7 +7321,7 @@ index 0000000000..2751391ac7
+TARGET_DEVICES += xiaomi_ax1800
diff --git a/target/linux/ipq807x/image/ipq807x.mk b/target/linux/ipq807x/image/ipq807x.mk
new file mode 100644
index 0000000000..599346b9ca
index 0000000000..2b23357323
--- /dev/null
+++ b/target/linux/ipq807x/image/ipq807x.mk
@@ -0,0 +1,72 @@
@@ -12332,7 +12332,7 @@ index 0000000000..94b2a3ffd5
+ /* Set OTG VBUS Valid from HSPHY to controller */
diff --git a/target/linux/ipq807x/patches/109-tplink.patch b/target/linux/ipq807x/patches/109-tplink.patch
new file mode 100644
index 0000000000..f12f5bc70d
index 0000000000..3ad3ffd99c
--- /dev/null
+++ b/target/linux/ipq807x/patches/109-tplink.patch
@@ -0,0 +1,1518 @@

75
patches/0031-ath10k-ct-update-the-driver.patch Normal file
View File

@@ -0,0 +1,75 @@
From 644f52a193d0430e41d6c28c221e801a0e87affa Mon Sep 17 00:00:00 2001
From: John Crispin <john@phrozen.org>
Date: Fri, 23 Apr 2021 16:16:31 +0200
Subject: [PATCH] ath10k-ct: update the driver
Signed-off-by: John Crispin <john@phrozen.org>
---
package/kernel/ath10k-ct/Makefile | 6 +--
...64-ath10k-commit-rates-from-mac80211.patch | 37 -------------------
2 files changed, 3 insertions(+), 40 deletions(-)
delete mode 100644 package/kernel/ath10k-ct/patches/164-ath10k-commit-rates-from-mac80211.patch
diff --git a/package/kernel/ath10k-ct/Makefile b/package/kernel/ath10k-ct/Makefile
index a225bd8b19..8c2c36062d 100644
--- a/package/kernel/ath10k-ct/Makefile
+++ b/package/kernel/ath10k-ct/Makefile
@@ -8,9 +8,9 @@ PKG_LICENSE_FILES:=
PKG_SOURCE_URL:=https://github.com/greearb/ath10k-ct.git
PKG_SOURCE_PROTO:=git
-PKG_SOURCE_DATE:=2021-01-11
-PKG_SOURCE_VERSION:=9fe1df7d4f783b6b0cd1c99d11979e5a6e6fc40b
-PKG_MIRROR_HASH:=4e30e256716611045e930b95eadaa8bfcadd5bdd8bbe3869cfe0f377920e812b
+PKG_SOURCE_DATE:=2021-04-23
+PKG_SOURCE_VERSION:=8eca56d1514042b4af34004e0bbf69e40351d499
+PKG_MIRROR_HASH:=4ce22470b0cd15cc3cb04478678407e976c48010baab517fa1ac37685b791d95
# Build the 5.10 ath10k-ct driver version.
# Probably this should match as closely as
diff --git a/package/kernel/ath10k-ct/patches/164-ath10k-commit-rates-from-mac80211.patch b/package/kernel/ath10k-ct/patches/164-ath10k-commit-rates-from-mac80211.patch
deleted file mode 100644
index 842f3ea2a5..0000000000
--- a/package/kernel/ath10k-ct/patches/164-ath10k-commit-rates-from-mac80211.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From: Sven Eckelmann <sven@narfation.org>
-Date: Tue, 26 Feb 2019 08:06:35 +0100
-Subject: ath10k-ct: apply mac80211 rates to ath10k-ct rate state
-
-The rates from mac80211 have to be copied to the state of ath10k-ct or
-otherwise the ath10k_check_apply_special_rates function overwrites
-them again with some default values. This breaks for example the
-mcast_rate set for a wifi-iface.
-
-Signed-off-by: Sven Eckelmann <sven@narfation.org>
-
---- a/ath10k-5.10/mac.c
-+++ b/ath10k-5.10/mac.c
-@@ -6774,6 +6774,7 @@ static void ath10k_recalculate_mgmt_rate
- return;
- }
-
-+ arvif->mgt_rate[def->chan->band] = hw_rate_code;
- vdev_param = ar->wmi.vdev_param->mgmt_rate;
- ret = ath10k_wmi_vdev_set_param(ar, arvif->vdev_id, vdev_param,
- hw_rate_code);
-@@ -7000,6 +7001,7 @@ static void ath10k_bss_info_changed(stru
- "mac vdev %d mcast_rate %x\n",
- arvif->vdev_id, rate);
-
-+ arvif->mcast_rate[band] = rate;
- vdev_param = ar->wmi.vdev_param->mcast_data_rate;
- ret = ath10k_wmi_vdev_set_param(ar, arvif->vdev_id,
- vdev_param, rate);
-@@ -7008,6 +7010,7 @@ static void ath10k_bss_info_changed(stru
- "failed to set mcast rate on vdev %i: %d\n",
- arvif->vdev_id, ret);
-
-+ arvif->bcast_rate[band] = rate;
- vdev_param = ar->wmi.vdev_param->bcast_data_rate;
- ret = ath10k_wmi_vdev_set_param(ar, arvif->vdev_id,
- vdev_param, rate);
--
2.25.1

1
profiles/ucentral-ap.yml
View File

@@ -24,6 +24,7 @@ packages:
- tcpdump
- tmate
- ucentral-client
- ucentral-event
- ucentral-jsonschema
- ucentral-schema
- ucentral-wifi