[openwrt/openwrt] mwlwifi: add pending patch to fix compilation with kernel 6.6.109+

[LEDE Commits]

robimarko pushed a commit to openwrt/openwrt.git, branch openwrt-24.10:
https://git.openwrt.org/a8afcd8fc26fa7b348867f03ed3821167a9e68a8

commit a8afcd8fc26fa7b348867f03ed3821167a9e68a8
Author: Stefan Kalscheuer <stefan at stklcode.de>
AuthorDate: Sat May 31 17:07:40 2025 +0200

    mwlwifi: add pending patch to fix compilation with kernel 6.6.109+
    
    Building against recent kernel versions (noticed with 6.12) and -Werror
    can fail because a macro MAX(a,b) is already defined in minmax.h or
    kernel.h before 5.10.
    
    Initially noticed on 6.12, but it now happens after the kernel bump to
    6.6.109 as well (upstream commit 6183c65)
    
    In file included from ../mwlwifi-2025.02.06~db97edf2/hif/fwcmd.h:23,
                     from ../mwlwifi-2025.02.06~db97edf2/core.c:25:
    ../mwlwifi-2025.02.06~db97edf2/hif/hostcmd.h:1124: error: "MAX" redefined [-Werror]
     1124 | #define MAX(a, b) (((a) > (b)) ? (a) : (b))
          |         ^~~
    In file included from usr/include/mac80211-backport/linux/minmax.h:4,
                     from ./include/linux/kernel.h:27,
                     from usr/include/mac80211-backport/linux/kernel.h:3,
                     from ./include/linux/skbuff.h:13,
                     from usr/include/mac80211-backport/linux/skbuff.h:3,
                     from ./include/linux/if_ether.h:19,
                     from usr/include/mac80211-backport/linux/if_ether.h:3,
                     from ./include/linux/etherdevice.h:20,
                     from usr/include/mac80211-backport/linux/etherdevice.h:3,
                     from ../mwlwifi-2025.02.06~db97edf2/core.c:18:
    ./include/linux/minmax.h:315: note: this is the location of the previous definition
      315 | #define MAX(a, b) __cmp(max, a, b)
          |         ^~~
    
    Add a pending upstream patch which replaces the MAX(a,b) macro to avoid
    conflicts and allow compilation with 6.12 backports
    
    (cherry picked from commit 822bceb1d12bdb08688051ead06e0c4462e7d123)
    
    Signed-off-by: Stefan Kalscheuer <stefan at stklcode.de>
    Link: https://github.com/openwrt/openwrt/pull/20420
    Signed-off-by: Robert Marko <robimarko at gmail.com>
---
 package/kernel/mwlwifi/Makefile                    |  2 +-
 ...a-b-macro-to-avoid-conflict-with-kernel.h.patch | 51 ++++++++++++++++++++++
 2 files changed, 52 insertions(+), 1 deletion(-)

diff --git a/package/kernel/mwlwifi/Makefile b/package/kernel/mwlwifi/Makefile
index 07c3acc5f9..38b1db439b 100644
--- a/package/kernel/mwlwifi/Makefile
+++ b/package/kernel/mwlwifi/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mwlwifi
-PKG_RELEASE=1
+PKG_RELEASE=2
 
 PKG_LICENSE:=ISC
 PKG_LICENSE_FILES:=
diff --git a/package/kernel/mwlwifi/patches/030-remove-MAX-a-b-macro-to-avoid-conflict-with-kernel.h.patch b/package/kernel/mwlwifi/patches/030-remove-MAX-a-b-macro-to-avoid-conflict-with-kernel.h.patch
new file mode 100644
index 0000000000..79bb0ebab6
--- /dev/null
+++ b/package/kernel/mwlwifi/patches/030-remove-MAX-a-b-macro-to-avoid-conflict-with-kernel.h.patch
@@ -0,0 +1,51 @@
+From 8c19700558b154b4898e49014b9a9725dabadddb Mon Sep 17 00:00:00 2001
+From: Stefan Kalscheuer <stefan at stklcode.de>
+Date: Sat, 31 May 2025 16:52:23 +0200
+Subject: [PATCH] remove MAX(a,b) macro to avoid conflict with
+ kernel.h/minmax.h
+
+Building against recent kernel versions (noticed with 6.12) and -Werror
+can fail because a macro MAX(a,b) is already defined in minmax.h or
+kernel.h before 5.10.
+
+In file included from ../mwlwifi-2025.02.06~db97edf2/hif/fwcmd.h:23,
+                 from ../mwlwifi-2025.02.06~db97edf2/core.c:25:
+../mwlwifi-2025.02.06~db97edf2/hif/hostcmd.h:1124:9: error: "MAX" redefined [-Werror]
+ 1124 | #define MAX(a, b) (((a) > (b)) ? (a) : (b))
+      |         ^~~
+In file included from usr/include/mac80211-backport/linux/minmax.h:4,
+                 from ./include/linux/kernel.h:28,
+                 from usr/include/mac80211-backport/linux/kernel.h:3,
+                 from ./include/linux/skbuff.h:13,
+                 from usr/include/mac80211-backport/linux/skbuff.h:3,
+                 from ./include/linux/if_ether.h:19,
+                 from usr/include/mac80211-backport/linux/if_ether.h:3,
+                 from ./include/linux/etherdevice.h:20,
+                 from usr/include/mac80211-backport/linux/etherdevice.h:3,
+                 from ../mwlwifi-2025.02.06~db97edf2/core.c:18:
+./include/linux/minmax.h:330:9: note: this is the location of the previous definition
+  330 | #define MAX(a,b) __cmp(max,a,b)
+      |         ^~~
+
+This macro is not used anywhere else but in the very next line, so
+instead of adding conditionals, let's expand MAX_GROUP_PER_CHANNEL_RATE
+and drop the definition of MAX.
+
+Signed-off-by: Stefan Kalscheuer <stefan at stklcode.de>
+---
+ hif/hostcmd.h | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+--- a/hif/hostcmd.h
++++ b/hif/hostcmd.h
+@@ -1121,9 +1121,8 @@ struct hostcmd_cmd_get_fw_region_code_sc
+ #define HAL_TRPC_ID_MAX_SC4        32
+ #define MAX_GROUP_PER_CHANNEL_5G   39
+ #define MAX_GROUP_PER_CHANNEL_2G   21
+-#define	MAX(a, b) (((a) > (b)) ? (a) : (b))
+ #define MAX_GROUP_PER_CHANNEL_RATE \
+-	MAX(MAX_GROUP_PER_CHANNEL_5G, MAX_GROUP_PER_CHANNEL_2G)
++	((MAX_GROUP_PER_CHANNEL_5G > MAX_GROUP_PER_CHANNEL_2G) ? MAX_GROUP_PER_CHANNEL_5G : MAX_GROUP_PER_CHANNEL_2G)
+ 
+ struct channel_power_tbl_sc4 {
+ 	u8 channel;