mac80211: fix build on UML
A duplicate include guard prevents inclusion of barrier.h in UML build and this prevents mac80211 from building. This patch re-enables mac80211 hwsim and renames the include guard. See https://lists.openwrt.org/pipermail/openwrt-devel/2015-June/033614.html for details. Signed-off-by: Martin Tippmann <martin.tippmann@gmail.com> Signed-off-by: Nicolas Thill <nico@openwrt.org> SVN-Revision: 46133
This commit is contained in:
parent
2b1964181c
commit
0aa351196a
2 changed files with 16 additions and 1 deletions
|
@ -60,7 +60,7 @@ define KernelPackage/mac80211/Default
|
|||
SUBMENU:=$(WMENU)
|
||||
URL:=https://wireless.wiki.kernel.org/
|
||||
MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
|
||||
DEPENDS:=@!TARGET_uml @!LINUX_4_1
|
||||
DEPENDS:=@!LINUX_4_1
|
||||
endef
|
||||
|
||||
define KernelPackage/cfg80211
|
||||
|
|
15
package/kernel/mac80211/patches/010-fix-uml-build.patch
Normal file
15
package/kernel/mac80211/patches/010-fix-uml-build.patch
Normal file
|
@ -0,0 +1,15 @@
|
|||
--- a/backport-include/asm/barrier.h
|
||||
+++ b/backport-include/asm/barrier.h
|
||||
@@ -1,9 +1,9 @@
|
||||
-#ifndef __BACKPORT_ASM_GENERIC_BARRIER_H
|
||||
-#define __BACKPORT_ASM_GENERIC_BARRIER_H
|
||||
+#ifndef __BACKPORT_ASM_BARRIER_H
|
||||
+#define __BACKPORT_ASM_BARRIER_H
|
||||
#include_next <asm/barrier.h>
|
||||
|
||||
#ifndef dma_rmb
|
||||
#define dma_rmb() rmb()
|
||||
#endif
|
||||
|
||||
-#endif /* __BACKPORT_ASM_GENERIC_BARRIER_H */
|
||||
+#endif /* __BACKPORT_ASM_BARRIER_H */
|
Loading…
Reference in a new issue