From: Felix Fietkau Date: Mon, 12 Dec 2011 14:42:35 +0000 (+0000) Subject: mac80211: make mesh support optional X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=d886c0aaed49047a7a799135f90c50c01d36fee8;p=librecmc%2Flibrecmc.git mac80211: make mesh support optional SVN-Revision: 29506 --- diff --git a/package/mac80211/Makefile b/package/mac80211/Makefile index c5582fe793..c57292200f 100644 --- a/package/mac80211/Makefile +++ b/package/mac80211/Makefile @@ -32,6 +32,7 @@ PKG_CONFIG_DEPENDS:= \ CONFIG_PACKAGE_kmod-mac80211 \ $(patsubst %,CONFIG_PACKAGE_kmod-%,$(PKG_DRIVERS)) \ CONFIG_PACKAGE_MAC80211_DEBUGFS \ + CONFIG_PACKAGE_MAC80211_MESH \ CONFIG_PACKAGE_ATH_DEBUG \ CONFIG_PACKAGE_B43_DEBUG \ CONFIG_PACKAGE_B43_PIO \ @@ -89,6 +90,10 @@ define KernelPackage/mac80211/config Say N unless you know you need this. + config PACKAGE_MAC80211_MESH + bool "Enable 802.11s mesh support" + default y + endmenu endef @@ -1068,6 +1073,7 @@ BUILDFLAGS:= \ $(if $(CONFIG_PCI),-DCONFIG_ATH9K_PCI) \ $(if $(CONFIG_TARGET_ar71xx),-DCONFIG_ATH9K_AHB) \ $(if $(CONFIG_PACKAGE_MAC80211_DEBUGFS), -DCONFIG_CFG80211_DEBUGFS -DCONFIG_MAC80211_DEBUGFS -DCONFIG_ATH9K_DEBUGFS -DCONFIG_CARL9170_DEBUGFS -DCONFIG_ATH9K_HTC_DEBUGFS -DCONFIG_ATH5K_DEBUG) \ + $(if $(CONFIG_PACKAGE_MAC80211_MESH),-DCONFIG_MAC80211_MESH) \ $(if $(CONFIG_PACKAGE_ATH_DEBUG),-DCONFIG_ATH_DEBUG -DCONFIG_ATH9K_PKTLOG) \ -D__CONFIG_MAC80211_RC_DEFAULT=minstrel \ -DCONFIG_MAC80211_RC_MINSTREL_HT \ @@ -1102,6 +1108,7 @@ MAKE_OPTS:= \ CONFIG_CFG80211=$(if $(CONFIG_PACKAGE_kmod-cfg80211),m) \ CONFIG_MAC80211=$(if $(CONFIG_PACKAGE_kmod-mac80211),m) \ CONFIG_MAC80211_RC_MINSTREL=y \ + CONFIG_MAC80211_MESH=$(CONFIG_PACKAGE_MAC80211_MESH) \ CONFIG_MAC80211_LEDS=$(CONFIG_LEDS_TRIGGERS) \ CONFIG_CFG80211_DEBUGFS=$(if $(CONFIG_PACKAGE_MAC80211_DEBUGFS),y) \ CONFIG_MAC80211_DEBUGFS=$(if $(CONFIG_PACKAGE_MAC80211_DEBUGFS),y) \ diff --git a/package/mac80211/patches/008-disable_mesh.patch b/package/mac80211/patches/008-disable_mesh.patch new file mode 100644 index 0000000000..3c00938afc --- /dev/null +++ b/package/mac80211/patches/008-disable_mesh.patch @@ -0,0 +1,11 @@ +--- a/config.mk ++++ b/config.mk +@@ -188,7 +188,7 @@ CONFIG_MAC80211_LEDS=y + endif #CONFIG_LEDS_TRIGGERS + + # enable mesh networking too +-CONFIG_MAC80211_MESH=y ++# CONFIG_MAC80211_MESH=y + + CONFIG_CFG80211=m + CONFIG_CFG80211_DEFAULT_PS=y