qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-30 18:14:04 +02:00
Code

mac80211: make mesh support optional

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29506 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd 2011-12-12 14:42:35 +00:00
parent 1e26277d1e
commit 123714b1f0
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
package/mac80211/Makefile
View File

@ -32,6 +32,7 @@ PKG_CONFIG_DEPENDS:= \
CONFIG_PACKAGE_kmod-mac80211 \ CONFIG_PACKAGE_kmod-mac80211 \
$(patsubst %,CONFIG_PACKAGE_kmod-%,$(PKG_DRIVERS)) \ $(patsubst %,CONFIG_PACKAGE_kmod-%,$(PKG_DRIVERS)) \
CONFIG_PACKAGE_MAC80211_DEBUGFS \ CONFIG_PACKAGE_MAC80211_DEBUGFS \
CONFIG_PACKAGE_MAC80211_MESH \
CONFIG_PACKAGE_ATH_DEBUG \ CONFIG_PACKAGE_ATH_DEBUG \
CONFIG_PACKAGE_B43_DEBUG \ CONFIG_PACKAGE_B43_DEBUG \
CONFIG_PACKAGE_B43_PIO \ CONFIG_PACKAGE_B43_PIO \
@ -89,6 +90,10 @@ define KernelPackage/mac80211/config
Say N unless you know you need this. Say N unless you know you need this.
config PACKAGE_MAC80211_MESH
bool "Enable 802.11s mesh support"
default y
endmenu endmenu
endef endef
@ -1068,6 +1073,7 @@ BUILDFLAGS:= \
$(if $(CONFIG_PCI),-DCONFIG_ATH9K_PCI) \ $(if $(CONFIG_PCI),-DCONFIG_ATH9K_PCI) \
$(if $(CONFIG_TARGET_ar71xx),-DCONFIG_ATH9K_AHB) \ $(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_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) \ $(if $(CONFIG_PACKAGE_ATH_DEBUG),-DCONFIG_ATH_DEBUG -DCONFIG_ATH9K_PKTLOG) \
-D__CONFIG_MAC80211_RC_DEFAULT=minstrel \ -D__CONFIG_MAC80211_RC_DEFAULT=minstrel \
-DCONFIG_MAC80211_RC_MINSTREL_HT \ -DCONFIG_MAC80211_RC_MINSTREL_HT \
@ -1102,6 +1108,7 @@ MAKE_OPTS:= \
CONFIG_CFG80211=$(if $(CONFIG_PACKAGE_kmod-cfg80211),m) \ CONFIG_CFG80211=$(if $(CONFIG_PACKAGE_kmod-cfg80211),m) \
CONFIG_MAC80211=$(if $(CONFIG_PACKAGE_kmod-mac80211),m) \ CONFIG_MAC80211=$(if $(CONFIG_PACKAGE_kmod-mac80211),m) \
CONFIG_MAC80211_RC_MINSTREL=y \ CONFIG_MAC80211_RC_MINSTREL=y \
CONFIG_MAC80211_MESH=$(CONFIG_PACKAGE_MAC80211_MESH) \
CONFIG_MAC80211_LEDS=$(CONFIG_LEDS_TRIGGERS) \ CONFIG_MAC80211_LEDS=$(CONFIG_LEDS_TRIGGERS) \
CONFIG_CFG80211_DEBUGFS=$(if $(CONFIG_PACKAGE_MAC80211_DEBUGFS),y) \ CONFIG_CFG80211_DEBUGFS=$(if $(CONFIG_PACKAGE_MAC80211_DEBUGFS),y) \
CONFIG_MAC80211_DEBUGFS=$(if $(CONFIG_PACKAGE_MAC80211_DEBUGFS),y) \ CONFIG_MAC80211_DEBUGFS=$(if $(CONFIG_PACKAGE_MAC80211_DEBUGFS),y) \

11
package/mac80211/patches/008-disable_mesh.patch Normal file
View File

@ -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