treewide: Remove dependency on br_netfilter

Upstream OpenWrt 24.10 and later uses nftables by default.
Bridge filtering is not really needed anymore.

This should also prevent unnecessary chain dependencies getting built
like like `kmod-ipt-ipopt`.

Signed-off-by: Sean Khan <datapronix@protonmail.com>
This commit is contained in:
Sean Khan 2025-05-30 18:07:45 -04:00
parent 03f6cb25eb
commit c0bbc6f168
5 changed files with 17 additions and 12 deletions

View File

@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=qca-mcs PKG_NAME:=qca-mcs
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE_URL:=https://git.codelinaro.org/clo/qsdk/oss/lklm/qca-mcs.git PKG_SOURCE_URL:=https://git.codelinaro.org/clo/qsdk/oss/lklm/qca-mcs.git
PKG_SOURCE_DATE:=2024-09-04 PKG_SOURCE_DATE:=2024-09-04
@ -24,8 +24,7 @@ define KernelPackage/qca-mcs
MAINTAINER:=Qualcomm Atheros, Inc. MAINTAINER:=Qualcomm Atheros, Inc.
TITLE:=QCA Multicast Snooping Support TITLE:=QCA Multicast Snooping Support
DEPENDS:=+@KERNEL_IPV6_MROUTE +@KERNEL_IP_MROUTE DEPENDS:=+@KERNEL_IPV6_MROUTE +@KERNEL_IP_MROUTE
KCONFIG:=CONFIG_NETFILTER=y \ KCONFIG:=CONFIG_NETFILTER=y
CONFIG_BRIDGE_NETFILTER=y
FILES:=$(PKG_BUILD_DIR)/qca-mcs.ko FILES:=$(PKG_BUILD_DIR)/qca-mcs.ko
AUTOLOAD:=$(call AutoLoad,41,qca-mcs) AUTOLOAD:=$(call AutoLoad,41,qca-mcs)
endef endef

View File

@ -468,7 +468,7 @@ define KernelPackage/qca-nss-drv-ovpn-mgr
+kmod-qca-nss-drv \ +kmod-qca-nss-drv \
+@NSS_DRV_QVPN_ENABLE \ +@NSS_DRV_QVPN_ENABLE \
+kmod-qca-nss-cfi-cryptoapi \ +kmod-qca-nss-cfi-cryptoapi \
+kmod-ipt-conntrack \ +kmod-nf-conntrack \
+kmod-tun \ +kmod-tun \
@BROKEN @BROKEN
FILES:=$(PKG_BUILD_DIR)/openvpn/src/qca-nss-ovpn-mgr.ko FILES:=$(PKG_BUILD_DIR)/openvpn/src/qca-nss-ovpn-mgr.ko

View File

@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=qca-nss-ecm PKG_NAME:=qca-nss-ecm
PKG_RELEASE:=6 PKG_RELEASE:=7
PKG_SOURCE_URL:=https://git.codelinaro.org/clo/qsdk/oss/lklm/qca-nss-ecm.git PKG_SOURCE_URL:=https://git.codelinaro.org/clo/qsdk/oss/lklm/qca-nss-ecm.git
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
@ -42,9 +42,7 @@ define KernelPackage/qca-nss-ecm
+PACKAGE_kmod-pppoe:kmod-pppol2tp +PACKAGE_kmod-pppoe:kmod-pppol2tp
TITLE:=QCA NSS Enhanced Connection Manager (ECM) TITLE:=QCA NSS Enhanced Connection Manager (ECM)
FILES:=$(PKG_BUILD_DIR)/ecm.ko FILES:=$(PKG_BUILD_DIR)/ecm.ko
KCONFIG:=CONFIG_BRIDGE_NETFILTER=y \ KCONFIG:=CONFIG_NF_CONNTRACK_DSCPREMARK_EXT=y
CONFIG_NF_CONNTRACK_EVENTS=y \
CONFIG_NF_CONNTRACK_DSCPREMARK_EXT=y
endef endef
define KernelPackage/qca-nss-ecm/Description define KernelPackage/qca-nss-ecm/Description

View File

@ -29,9 +29,18 @@ sysctl_update() {
value=${2//\//\\/} value=${2//\//\\/}
file=${3:-/etc/sysctl.d/qca-nss-ecm.conf} file=${3:-/etc/sysctl.d/qca-nss-ecm.conf}
sed -i -e '/^#\?\(\s*'"${name}"'\s*=\s*\).*/{s//\1'"${value}"'/;:a;n;ba;q}' \ if [ -r "/proc/sys/${name//./\/}" ]; then
-e '$a'"${name}"'='"${value}" "${file}" sed -i -e '/^#\?\(\s*'"${name}"'\s*=\s*\).*/{s//\1'"${value}"'/;:a;n;ba;q}' \
sysctl -w ${name}=${value} -e '$a'"${name}"'='"${value}" "${file}"
sysctl -w ${name}=${value}
else
# If the sysctl value is not available but it is found in the file, disable it to avoid
# sysctl throwing warnings
if grep -qE '^#?\s*'"${name}\s*?=" "${file}"; then
sed -i -e '/^#\?\(\s*'"${name}"'\s*=\s*\).*/{s//\#\1'"${value}"'/;:a;n;ba;q}' \
-e '$a'"#${name}"'='"${value}" "${file}"
fi
fi
} }
get_front_end_mode() { get_front_end_mode() {

View File

@ -2,7 +2,6 @@ config ecm 'global'
option acceleration_engine 'auto' option acceleration_engine 'auto'
config ecm 'general' config ecm 'general'
option enable_bridge_filtering '0'
option disable_offloads '0' option disable_offloads '0'
option disable_flow_control '0' option disable_flow_control '0'
option disable_interrupt_moderation '0' option disable_interrupt_moderation '0'