X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/994c1fce91dfa45bc0aea43d77d83566dc9acc1b..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 0140ea264..887b9956f 100644 --- a/package/mac80211/patches/002-disable_rfkill.patch +++ b/package/mac80211/patches/002-disable_rfkill.patch @@ -1,59 +1,38 @@ --- a/config.mk +++ b/config.mk -@@ -145,7 +145,7 @@ ifneq ($(CONFIG_PCI),) +@@ -87,7 +87,7 @@ endif # build check + endif # kernel Makefile check - CONFIG_ATH5K=m - # CONFIG_ATH5K_DEBUG=y --CONFIG_ATH5K_RFKILL=y -+# CONFIG_ATH5K_RFKILL=y - CONFIG_ATH9K_HW=m - CONFIG_ATH9K=m - # CONFIG_ATH9K_DEBUG=y -@@ -153,7 +153,7 @@ CONFIG_ATH9K=m + # These both are needed by compat-wireless || compat-bluetooth so enable them +- CONFIG_COMPAT_RFKILL=y ++# CONFIG_COMPAT_RFKILL=y - CONFIG_IWLWIFI=m - CONFIG_IWLWIFI_LEDS=y --CONFIG_IWLWIFI_RFKILL=y -+# CONFIG_IWLWIFI_RFKILL=y - CONFIG_IWLWIFI_SPECTRUM_MEASUREMENT=y - # CONFIG_IWLWIFI_DEBUG=y - # CONFIG_IWLWIFI_DEBUGFS=y -@@ -173,7 +173,7 @@ CONFIG_B43_PCMCIA=y - endif - CONFIG_B43_PIO=y - CONFIG_B43_LEDS=y --CONFIG_B43_RFKILL=y -+# CONFIG_B43_RFKILL=y - CONFIG_B43_PHY_LP=y - # CONFIG_B43_DEBUG=y - # CONFIG_B43_FORCE_PIO=y -@@ -183,7 +183,7 @@ CONFIG_B43LEGACY_HWRNG=y - CONFIG_B43LEGACY_PCI_AUTOSELECT=y - CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y - CONFIG_B43LEGACY_LEDS=y --CONFIG_B43LEGACY_RFKILL=y -+# CONFIG_B43LEGACY_RFKILL=y - # CONFIG_B43LEGACY_DEBUG=y - CONFIG_B43LEGACY_DMA=y - CONFIG_B43LEGACY_PIO=y -@@ -373,7 +373,7 @@ CONFIG_RT2X00_LIB=m - CONFIG_RT2X00_LIB_HT=y - CONFIG_RT2X00_LIB_FIRMWARE=y - CONFIG_RT2X00_LIB_CRYPTO=y --CONFIG_RT2X00_LIB_RFKILL=y -+# CONFIG_RT2X00_LIB_RFKILL=y - CONFIG_RT2X00_LIB_LEDS=y - # CONFIG_RT2X00_LIB_DEBUGFS=y - # CONFIG_RT2X00_DEBUG=y -@@ -415,8 +415,8 @@ endif + 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