mptcp/openmptcprouter-feeds
1
0
Fork 0
mirror of https://github.com/Ysurac/openmptcprouter-feeds.git synced 2025-03-09 15:40:03 +00:00
Code Issues Releases Wiki Activity

Changes needed for kernel 6.6 support

Browse source
This commit is contained in:
Ycarus (Yannick Chabanois) 2023-10-19 12:05:34 +02:00
parent b2f4ad38ee
commit b8ca72b410
3 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
ndpi-netfilter2/Makefile
View file

@ -77,7 +77,8 @@ define KernelPackage/ipt-ndpi
TITLE:= nDPI net netfilter module TITLE:= nDPI net netfilter module
# DEPENDS:=+kmod-nf-conntrack +kmod-nf-conntrack-netlink +kmod-ipt-compat-xtables +libpcap @(LINUX_5_4||LINUX_5_15||TARGET_x86_64) # DEPENDS:=+kmod-nf-conntrack +kmod-nf-conntrack-netlink +kmod-ipt-compat-xtables +libpcap @(LINUX_5_4||LINUX_5_15||TARGET_x86_64)
# DEPENDS:=+kmod-nf-conntrack +kmod-nf-conntrack-netlink +kmod-ipt-compat-xtables +libpcap @(LINUX_5_4||LINUX_5_15) @!TARGET_ramips # DEPENDS:=+kmod-nf-conntrack +kmod-nf-conntrack-netlink +kmod-ipt-compat-xtables +libpcap @(LINUX_5_4||LINUX_5_15) @!TARGET_ramips
DEPENDS:=+kmod-nf-conntrack +kmod-nf-conntrack-netlink +kmod-ipt-compat-xtables +libpcap @!TARGET_ramips DEPENDS:=+kmod-nf-conntrack +kmod-nf-conntrack-netlink +(LINUX_5_4||LINUX_6_1):kmod-ipt-compat-xtables +libpcap @!TARGET_ramips
# DEPENDS:=+kmod-nf-conntrack +kmod-nf-conntrack-netlink +kmod-ipt-compat-xtables +libpcap
KCONFIG:=CONFIG_NF_CONNTRACK_LABELS=y \ KCONFIG:=CONFIG_NF_CONNTRACK_LABELS=y \
CONFIG_NETFILTER_XT_MATCH_CONNLABEL=y CONFIG_NETFILTER_XT_MATCH_CONNLABEL=y
FILES:= $(PKG_BUILD_DIR)/ndpi-netfilter/src/xt_ndpi.ko FILES:= $(PKG_BUILD_DIR)/ndpi-netfilter/src/xt_ndpi.ko

3
openmptcprouter/files/etc/uci-defaults/1980-omr-firewall
View file

@ -262,6 +262,9 @@ if [ "$(uci -q get openmptcprouter.settings.sipalg)" = "0" ]; then
[ -n "$(lsmod | grep nf_conntrack_sip)" ] && rmmod nf_conntrack_sip 2>&1 >/dev/null [ -n "$(lsmod | grep nf_conntrack_sip)" ] && rmmod nf_conntrack_sip 2>&1 >/dev/null
fi fi
# Remove mtu_fix check, doesn't work on kernel 6.6
sed -i 's/if (zone\.mtu_fix && this\.kernel < 0x040a0000) {/if (zone.mtu_fix \&\& this.kernel < 0x040a0000 \&\& false) {/' /usr/share/ucode/fw4.uc
rm -f /tmp/luci-indexcache rm -f /tmp/luci-indexcache
exit 0 exit 0

2
r8152/Makefile
View file

@ -26,7 +26,7 @@ define KernelPackage/usb-net-rtl8152-vendor
VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE) VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE)
TITLE:=Kernel module for USB-to-Ethernet Realtek convertors TITLE:=Kernel module for USB-to-Ethernet Realtek convertors
SUBMENU:=USB Support SUBMENU:=USB Support
DEPENDS:=+kmod-usb-net DEPENDS:=+kmod-usb-net @(LINUX_5_4||LINUX_6_1)
FILES:=$(PKG_BUILD_DIR)/r8152.ko FILES:=$(PKG_BUILD_DIR)/r8152.ko
AUTOLOAD:=$(call AutoProbe,r8152) AUTOLOAD:=$(call AutoProbe,r8152)
CONFLICTS:=kmod-usb-net-rtl8152 CONFLICTS:=kmod-usb-net-rtl8152