diff --git a/ndpi-netfilter2/Makefile b/ndpi-netfilter2/Makefile index 0d2466d7e..50ddd78ad 100644 --- a/ndpi-netfilter2/Makefile +++ b/ndpi-netfilter2/Makefile @@ -12,7 +12,8 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=ndpi-netfilter2 PKG_RELEASE:=4 #PKG_REV:=3deea541af037b663b1b83a055b80d9a06a0afd2 -PKG_REV:=5cf35a64c8296b69099d3bd4c8cb9222f3174901 +#PKG_REV:=5cf35a64c8296b69099d3bd4c8cb9222f3174901 +PKG_REV:=761993583265cf9a022be1ad2d701e446bb91d42 PKG_VERSION:=4-$(PKG_REV) PKG_SOURCE_PROTO:=git diff --git a/ndpi-netfilter2/patches/003-fix-compilation-for-kernel-6.7.0.patch b/ndpi-netfilter2/patches/003-fix-compilation-for-kernel-6.7.0.patch deleted file mode 100644 index aa7cab996..000000000 --- a/ndpi-netfilter2/patches/003-fix-compilation-for-kernel-6.7.0.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- a/ndpi-netfilter/src/main.c 2023-12-22 18:46:47.999596865 +0100 -+++ b/ndpi-netfilter/src/main.c 2023-12-22 18:48:52.981393673 +0100 -@@ -2840,7 +2840,11 @@ - #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 8, 0) - net->ct.label_words = n->labels_word; - #endif -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 7, 0) - net->ct.labels_used--; -+#else -+ atomic_dec_return_relaxed(&net->ct.labels_used); -+#endif - - #if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 19, 0) - struct nf_ct_iter_data iter_data = { -@@ -3138,7 +3142,11 @@ - n->labels_word = ACCESS_ONCE(net->ct.label_words); - net->ct.label_words = 2; - #endif -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 7, 0) - net->ct.labels_used++; -+#else -+ atomic_inc_return_relaxed(&net->ct.labels_used); -+#endif - #endif - if( ndpi_enable_flow && - nf_register_net_hooks(net, nf_nat_ipv4_ops,