From 491b54e75891b57703eb80852f5228e35a71d80d Mon Sep 17 00:00:00 2001 From: kenzok8 Date: Sun, 2 Nov 2025 20:40:59 +0800 Subject: [PATCH] update 2025-11-02 20:40:59 --- fullconenat-nft/Makefile | 2 +- fullconenat-nft/patches/010-fix-build-with-kernel-6.12.patch | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/fullconenat-nft/Makefile b/fullconenat-nft/Makefile index 0c648b903..76746dee8 100644 --- a/fullconenat-nft/Makefile +++ b/fullconenat-nft/Makefile @@ -11,7 +11,7 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=fullconenat-nft -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/fullcone-nat-nftables/nft-fullcone.git diff --git a/fullconenat-nft/patches/010-fix-build-with-kernel-6.12.patch b/fullconenat-nft/patches/010-fix-build-with-kernel-6.12.patch index b7af60455..1209678f7 100644 --- a/fullconenat-nft/patches/010-fix-build-with-kernel-6.12.patch +++ b/fullconenat-nft/patches/010-fix-build-with-kernel-6.12.patch @@ -1,10 +1,11 @@ --- a/src/nft_ext_fullcone.c +++ b/src/nft_ext_fullcone.c -@@ -121,7 +121,11 @@ static int exp_event_cb(unsigned int eve +@@ -121,7 +121,12 @@ static int exp_event_cb(unsigned int eve } #endif -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 12, 0) ++#if ((LINUX_VERSION_CODE >= KERNEL_VERSION(6, 6, 113)) && (LINUX_VERSION_CODE < KERNEL_VERSION(6, 7, 0))) || \ ++ (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 12, 0)) +static int nft_fullcone_validate(const struct nft_ctx *ctx, const struct nft_expr *expr) +#else static int nft_fullcone_validate(const struct nft_ctx *ctx, const struct nft_expr *expr, const struct nft_data **data)