X-Git-Url: https://git.archive.openwrt.org/?p=openwrt.git;a=blobdiff_plain;f=package%2Fmac80211%2Fpatches%2F002-disable_rfkill.patch;h=685006bd58454ba5331f691c4a3d49e236808b41;hp=2f71ccb92c0cc7e23d0f953a3323cc33a23dc5c4;hb=de017af48d93a4c8bd0691f5cb9315e2f5f15cf1;hpb=c0b61bdf0a1be6598e7a9072a987f4a35b71b339 diff --git a/package/mac80211/patches/002-disable_rfkill.patch b/package/mac80211/patches/002-disable_rfkill.patch index 2f71ccb92c..685006bd58 100644 --- a/package/mac80211/patches/002-disable_rfkill.patch +++ b/package/mac80211/patches/002-disable_rfkill.patch @@ -1,27 +1,27 @@ --- a/config.mk +++ b/config.mk -@@ -74,7 +74,7 @@ endif # build check +@@ -78,7 +78,7 @@ endif # build check endif # kernel Makefile check - # These both are needed by compat-wireless || compat-bluetooth so enable them -- CONFIG_COMPAT_RFKILL=y -+# CONFIG_COMPAT_RFKILL=y + # These both are needed by 802.11 and bluetooth so enable +- export CONFIG_COMPAT_RFKILL=y ++# export CONFIG_COMPAT_RFKILL=y ifeq ($(CONFIG_MAC80211),y) $(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") -@@ -626,10 +626,10 @@ endif #CONFIG_COMPAT_KERNEL_27 +@@ -690,10 +690,10 @@ endif #CONFIG_COMPAT_KERNEL_2_6_27 # We need the backported rfkill module on kernel < 2.6.31. # In more recent kernel versions use the in kernel rfkill module. - ifdef CONFIG_COMPAT_KERNEL_31 --CONFIG_RFKILL_BACKPORT=m -+# CONFIG_RFKILL_BACKPORT=m + ifdef CONFIG_COMPAT_KERNEL_2_6_31 +-export CONFIG_RFKILL_BACKPORT=m ++#export CONFIG_RFKILL_BACKPORT=m ifdef CONFIG_LEDS_TRIGGERS --CONFIG_RFKILL_BACKPORT_LEDS=y -+# CONFIG_RFKILL_BACKPORT_LEDS=y +-export CONFIG_RFKILL_BACKPORT_LEDS=y ++#export CONFIG_RFKILL_BACKPORT_LEDS=y endif #CONFIG_LEDS_TRIGGERS --CONFIG_RFKILL_BACKPORT_INPUT=y -+# CONFIG_RFKILL_BACKPORT_INPUT=y - endif #CONFIG_COMPAT_KERNEL_31 +-export CONFIG_RFKILL_BACKPORT_INPUT=y ++#export CONFIG_RFKILL_BACKPORT_INPUT=y + endif #CONFIG_COMPAT_KERNEL_2_6_31 --- a/include/linux/rfkill.h +++ b/include/linux/rfkill.h