X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/42c7a4ae6f1f6472079c7d91660b8ac3068ab7a3..a6ff6c1f36b886b61a08ac89996ee15340e6fc64:/package/mac80211/patches/002-disable_rfkill.patch?ds=sidebyside diff --git a/package/mac80211/patches/002-disable_rfkill.patch b/package/mac80211/patches/002-disable_rfkill.patch index c935fddf3..887b9956f 100644 --- a/package/mac80211/patches/002-disable_rfkill.patch +++ b/package/mac80211/patches/002-disable_rfkill.patch @@ -1,14 +1,38 @@ --- a/config.mk +++ b/config.mk -@@ -421,8 +421,8 @@ endif +@@ -87,7 +87,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 + + 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") +@@ -649,10 +649,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_WIRELESS_31 + ifdef CONFIG_COMPAT_KERNEL_2_6_31 -CONFIG_RFKILL_BACKPORT=m --CONFIG_RFKILL_BACKPORT_LEDS=y --CONFIG_RFKILL_BACKPORT_INPUT=y +# CONFIG_RFKILL_BACKPORT=m + ifdef CONFIG_LEDS_TRIGGERS +-CONFIG_RFKILL_BACKPORT_LEDS=y +# CONFIG_RFKILL_BACKPORT_LEDS=y + endif #CONFIG_LEDS_TRIGGERS +-CONFIG_RFKILL_BACKPORT_INPUT=y +# CONFIG_RFKILL_BACKPORT_INPUT=y - endif + endif #CONFIG_COMPAT_KERNEL_2_6_31 + +--- a/include/linux/rfkill.h ++++ b/include/linux/rfkill.h +@@ -3,6 +3,10 @@ + + #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,31)) + ++#undef CONFIG_RFKILL ++#undef CONFIG_RFKILL_LEDS ++#undef CONFIG_RFKILL_MODULE ++ + #include_next + #else