X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/bb03c545e8fec89bf3b1feae52095b2afd291e84..f251f740878af188b1f27d19ec921efa6c577349:/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 338631610..1cb319e39 100644 --- a/package/mac80211/patches/002-disable_rfkill.patch +++ b/package/mac80211/patches/002-disable_rfkill.patch @@ -1,6 +1,6 @@ --- a/config.mk +++ b/config.mk -@@ -74,7 +74,7 @@ endif # build check +@@ -87,7 +87,7 @@ endif # build check endif # kernel Makefile check # These both are needed by compat-wireless || compat-bluetooth so enable them @@ -9,17 +9,19 @@ 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") -@@ -588,8 +588,8 @@ endif #CONFIG_COMPAT_KERNEL_27 +@@ -646,10 +646,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 + 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 #CONFIG_COMPAT_KERNEL_31 + endif #CONFIG_COMPAT_KERNEL_2_6_31 --- a/include/linux/rfkill.h +++ b/include/linux/rfkill.h