mac80211: fix issues with including linux/acpi_amd_wbrf.h on newer ke…

…rnels Change the double-include guard to avoid conflict with the linux kernel header Reported-by: Tony Ambardar <[email protected]> Signed-off-by: Felix Fietkau <[email protected]>
lkiuyu · Jan 14, 2025 · 7bf3bc8 · 7bf3bc8
1 parent abbec42
commit 7bf3bc8
Showing 1 changed file with 32 additions and 0 deletions.
diff --git a/...nel/mac80211/patches/build/110-backport-include-fix-linux-acpi_amd_wbrf.h-inclusion.patch b/...nel/mac80211/patches/build/110-backport-include-fix-linux-acpi_amd_wbrf.h-inclusion.patch
@@ -0,0 +1,32 @@
+From: Felix Fietkau <[email protected]>
+Date: Tue, 14 Jan 2025 11:42:25 +0100
+Subject: [PATCH] backport-include: fix linux/acpi_amd_wbrf.h inclusion
+
+Fix building for kernel >= 6.8 by adjusting incorrect guard usage,
+otherwise an #include_next header is masked and compilation will fail
+for net/mac80211/wbrf.c in the mac80211 kernel module.
+
+Fixes: 52cdcaab ("backport-include: backport linux/acpi_amd_wbrf.h")
+Reported-by: Tony Ambardar <[email protected]>
+Signed-off-by: Felix Fietkau <[email protected]>
+---
+
+--- a/backport-include/linux/acpi_amd_wbrf.h
++++ b/backport-include/linux/acpi_amd_wbrf.h
+@@ -4,8 +4,8 @@
+  * Copyright (C) 2023 Advanced Micro Devices
+  */
+
+-#ifndef _ACPI_AMD_WBRF_H
+-#define _ACPI_AMD_WBRF_H
++#ifndef __BACKPORT_ACPI_AMD_WBRF_H
++#define __BACKPORT_ACPI_AMD_WBRF_H
+
+ #if LINUX_VERSION_IS_GEQ(6,8,0)
+ #include_next <linux/acpi_amd_wbrf.h>
+@@ -83,4 +83,4 @@ int amd_wbrf_unregister_notifier(struct
+ }
+
+ #endif /* >=6,8,0 */
+-#endif /* _ACPI_AMD_WBRF_H */
++#endif /* __BACKPORT_ACPI_AMD_WBRF_H */