From 364be1fd7f7b379790d5f62a3dedb9d45fea4bed Mon Sep 17 00:00:00 2001 From: Mieczyslaw Nalewaj Date: Thu, 25 Dec 2025 18:40:35 +0100 Subject: [PATCH] mac80211: fix build failure on kernel 6.18 Kernel since version 6.16 defines `SOCKWQ_ASYNC_NOSPACE` and SOCKWQ_ASYNC_WAITDATA` in the socket_flags enum, which causes redefinition errors when compiling the backport package[1]. Since kernel 6.12 also has them defined, the test and definition of these constants have been completely abandoned. Thanks to this, there are no compilation errors on either kernel 6.12 or 6.18. 1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.16&id=0e81cfd971dc4833c699dcd8924e54a5021bc4e8 Signed-off-by: Mieczyslaw Nalewaj Link: https://github.com/openwrt/openwrt/pull/21078 Signed-off-by: Robert Marko --- .../patches/build/500-fix_build_on_6_18.patch | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 package/kernel/mac80211/patches/build/500-fix_build_on_6_18.patch diff --git a/package/kernel/mac80211/patches/build/500-fix_build_on_6_18.patch b/package/kernel/mac80211/patches/build/500-fix_build_on_6_18.patch new file mode 100644 index 00000000000..227d1efc1e4 --- /dev/null +++ b/package/kernel/mac80211/patches/build/500-fix_build_on_6_18.patch @@ -0,0 +1,15 @@ +--- a/backport-include/linux/net.h ++++ b/backport-include/linux/net.h +@@ -3,12 +3,4 @@ + #include_next + #include + +- +-#ifndef SOCKWQ_ASYNC_NOSPACE +-#define SOCKWQ_ASYNC_NOSPACE SOCK_ASYNC_NOSPACE +-#endif +-#ifndef SOCKWQ_ASYNC_WAITDATA +-#define SOCKWQ_ASYNC_WAITDATA SOCK_ASYNC_WAITDATA +-#endif +- + #endif /* __BACKPORT_LINUX_NET_H */