summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2008-02-23 15:17:21 +0100
committerJohn W. Linville <linville@tuxdriver.com>2008-03-06 15:30:43 -0500
commit2f5ce793c0817d8d38f1c7ad23945607d57e47d6 (patch)
tree5adfc47c408ba66ea9507fc7e79e65add81956b9
parentdc0b0f7d1e34b797b98e4d16122b3ea6f775154c (diff)
downloadkernel-crypto-2f5ce793c0817d8d38f1c7ad23945607d57e47d6.tar.gz
kernel-crypto-2f5ce793c0817d8d38f1c7ad23945607d57e47d6.tar.xz
kernel-crypto-2f5ce793c0817d8d38f1c7ad23945607d57e47d6.zip
mac80211: enable mesh in Kconfig
Currently marked BROKEN because of endianness problems. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--net/mac80211/Kconfig15
-rw-r--r--net/mac80211/Makefile6
2 files changed, 21 insertions, 0 deletions
diff --git a/net/mac80211/Kconfig b/net/mac80211/Kconfig
index 45c7c0c3875..57bf358b2e7 100644
--- a/net/mac80211/Kconfig
+++ b/net/mac80211/Kconfig
@@ -81,6 +81,14 @@ config MAC80211_RC_SIMPLE
Say N unless you know what you are doing.
endmenu
+config MAC80211_MESH
+ bool "Enable mac80211 mesh networking (pre-802.11s) support"
+ depends on MAC80211 && EXPERIMENTAL && BROKEN
+ ---help---
+ This options enables support of pre-802.11s mesh interfaces.
+ For more information visit http://o11s.org
+
+
config MAC80211_LEDS
bool "Enable LED triggers"
depends on MAC80211 && LEDS_TRIGGERS
@@ -166,3 +174,10 @@ config MAC80211_VERBOSE_PS_DEBUG
---help---
Say Y here to print out verbose powersave
mode debug messages.
+
+config MAC80211_VERBOSE_MPL_DEBUG
+ bool "Verbose mesh peer link debugging"
+ depends on MAC80211_DEBUG && MAC80211_MESH
+ ---help---
+ Say Y here to print out verbose mesh peer link
+ debug messages.
diff --git a/net/mac80211/Makefile b/net/mac80211/Makefile
index 9d7a19581a2..829ce4256b7 100644
--- a/net/mac80211/Makefile
+++ b/net/mac80211/Makefile
@@ -36,6 +36,12 @@ mac80211-$(CONFIG_MAC80211_DEBUGFS) += \
debugfs_netdev.o \
debugfs_key.o
+mac80211-$(CONFIG_MAC80211_MESH) += \
+ mesh.o \
+ mesh_pathtbl.o \
+ mesh_plink.o \
+ mesh_hwmp.o
+
# Build rate control algorithm(s)
CFLAGS_rc80211_simple.o += -DRC80211_SIMPLE_COMPILE