From b58311efbf0a24cc3f54f1afdf112e5786915fd1 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Thu, 4 Aug 2022 14:08:29 +0200
Subject: [PATCH] Fix ndpi-netfilter compilation on 5.4

---
 ndpi-netfilter2/Makefile                      | 1 +
 ndpi-netfilter2/patches/outline-atomics.patch | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/ndpi-netfilter2/Makefile b/ndpi-netfilter2/Makefile
index 0f737dbab..13ebc5f14 100644
--- a/ndpi-netfilter2/Makefile
+++ b/ndpi-netfilter2/Makefile
@@ -48,6 +48,7 @@ MAKE_FLAGS += \
     KERNEL_DIR="$(LINUX_DIR)" \
     MODULES_DIR="$(TARGET_MODULES_DIR)" \
     ARCH="$(LINUX_KARCH)" \
+    KERNEL_RELEASE="$(KERNEL_PATCHVER)" \
     CROSS_COMPILE="$(TARGET_CROSS)" \
     CC="$(TARGET_CC)" \
     NDPI_PATH=$(PKG_BUILD_DIR)/ndpi-netfilter
diff --git a/ndpi-netfilter2/patches/outline-atomics.patch b/ndpi-netfilter2/patches/outline-atomics.patch
index bcb33a7fc..ef7f6fd5f 100644
--- a/ndpi-netfilter2/patches/outline-atomics.patch
+++ b/ndpi-netfilter2/patches/outline-atomics.patch
@@ -1,11 +1,13 @@
 --- a/ndpi-netfilter/src/Makefile	2022-08-03 21:27:52.321058402 +0200
 +++ b/ndpi-netfilter/src/Makefile	2022-08-03 21:28:27.572452447 +0200
-@@ -5,6 +5,9 @@
+@@ -5,6 +5,11 @@
  ccflags-y += -I${src}/${NDPI_SRC}/include -I${src}/${NDPI_SRC}/lib -I${src}/../libre -I${src}/${NDPI_SRC}/lib/third_party/include 
  ccflags-y += -DHAVE_CONFIG_H -DNDPI_LIB_COMPILATION -DOPENDPI_NETFILTER_MODULE -DNDPI_DETECTION_SUPPORT_IPV6 -g 
  ccflags-y += -Wno-declaration-after-statement
++ifeq ($(KERNEL_RELEASE),5.15)
 +ifeq ($(ARCH),arm64) 
 +	ccflags-y += -mno-outline-atomics
++endif
 +endif
  #ccflags-y += -Wshadow-local
  # Needed for pahole