openwrt-mirror/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2026-06-17 17:01:44 +04:00
Code Issues Packages Projects Releases Wiki Activity

mac80211: fix build failure on kernel 6.18

Browse Source 
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>
This commit is contained in:
Mieczyslaw Nalewaj
2025-12-25 18:40:35 +01:00
committed by Robert Marko
parent 6b37b04f90
commit 364be1fd7f
1 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
package/kernel/mac80211/patches/build/500-fix_build_on_6_18.patch
+15
View File
@@ -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 */