]> git.ipfire.org Git - thirdparty/openwrt.git/commitdiff
mac80211: fix build failure on kernel 6.18
authorMieczyslaw Nalewaj <namiltd@yahoo.com>
Thu, 25 Dec 2025 17:40:35 +0000 (18:40 +0100)
committerRobert Marko <robimarko@gmail.com>
Sat, 28 Mar 2026 10:51:10 +0000 (11:51 +0100)
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 <namiltd@yahoo.com>
Link: https://github.com/openwrt/openwrt/pull/21078
Signed-off-by: Robert Marko <robimarko@gmail.com>
package/kernel/mac80211/patches/build/500-fix_build_on_6_18.patch [new file with mode: 0644]

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 (file)
index 0000000..227d1ef
--- /dev/null
@@ -0,0 +1,15 @@
+--- a/backport-include/linux/net.h
++++ b/backport-include/linux/net.h
+@@ -3,12 +3,4 @@
+ #include_next <linux/net.h>
+ #include <linux/static_key.h>
+-
+-#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 */