Skip to content

Commit

Permalink
Changes needed for kernel 6.6 support
Browse files Browse the repository at this point in the history
  • Loading branch information
Ysurac committed Oct 19, 2023
1 parent b2f4ad3 commit b8ca72b
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 2 deletions.
3 changes: 2 additions & 1 deletion ndpi-netfilter2/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,8 @@ define KernelPackage/ipt-ndpi
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_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 \
CONFIG_NETFILTER_XT_MATCH_CONNLABEL=y
FILES:= $(PKG_BUILD_DIR)/ndpi-netfilter/src/xt_ndpi.ko
Expand Down
3 changes: 3 additions & 0 deletions openmptcprouter/files/etc/uci-defaults/1980-omr-firewall
Original file line number Diff line number Diff line change
Expand Up @@ -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
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

exit 0
2 changes: 1 addition & 1 deletion r8152/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ define KernelPackage/usb-net-rtl8152-vendor
VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE)
TITLE:=Kernel module for USB-to-Ethernet Realtek convertors
SUBMENU:=USB Support
DEPENDS:=+kmod-usb-net
DEPENDS:=+kmod-usb-net @(LINUX_5_4||LINUX_6_1)
FILES:=$(PKG_BUILD_DIR)/r8152.ko
AUTOLOAD:=$(call AutoProbe,r8152)
CONFLICTS:=kmod-usb-net-rtl8152
Expand Down

0 comments on commit b8ca72b

Please sign in to comment.