mac80211: merge a power save related race condition fix
[openwrt.git] / package / mac80211 / patches / 002-disable_rfkill.patch
1 --- a/config.mk
2 +++ b/config.mk
3 @@ -87,7 +87,7 @@ endif # build check
4 endif # kernel Makefile check
5
6 # These both are needed by compat-wireless || compat-bluetooth so enable them
7 - CONFIG_COMPAT_RFKILL=y
8 +# CONFIG_COMPAT_RFKILL=y
9
10 ifeq ($(CONFIG_MAC80211),y)
11 $(error "ERROR: you have MAC80211 compiled into the kernel, CONFIG_MAC80211=y, as such you cannot replace its mac80211 driver. You need this set to CONFIG_MAC80211=m. If you are using Fedora upgrade your kernel as later version should this set as modular. For further information on Fedora see https://bugzilla.redhat.com/show_bug.cgi?id=470143. If you are using your own kernel recompile it and make mac80211 modular")
12 @@ -642,10 +642,10 @@ endif #CONFIG_COMPAT_KERNEL_2_6_27
13 # We need the backported rfkill module on kernel < 2.6.31.
14 # In more recent kernel versions use the in kernel rfkill module.
15 ifdef CONFIG_COMPAT_KERNEL_2_6_31
16 -CONFIG_RFKILL_BACKPORT=m
17 +# CONFIG_RFKILL_BACKPORT=m
18 ifdef CONFIG_LEDS_TRIGGERS
19 -CONFIG_RFKILL_BACKPORT_LEDS=y
20 +# CONFIG_RFKILL_BACKPORT_LEDS=y
21 endif #CONFIG_LEDS_TRIGGERS
22 -CONFIG_RFKILL_BACKPORT_INPUT=y
23 +# CONFIG_RFKILL_BACKPORT_INPUT=y
24 endif #CONFIG_COMPAT_KERNEL_2_6_31
25
26 --- a/include/linux/rfkill.h
27 +++ b/include/linux/rfkill.h
28 @@ -3,6 +3,10 @@
29
30 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,31))
31
32 +#undef CONFIG_RFKILL
33 +#undef CONFIG_RFKILL_LEDS
34 +#undef CONFIG_RFKILL_MODULE
35 +
36 #include_next <linux/rfkill.h>
37
38 #else
This page took 0.052719 seconds and 5 git commands to generate.