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>

diff --git a/net/mac80211/Kconfig b/net/mac80211/Kconfig
index 45c7c0c3875e808beb1ad1085a213955d6ca8235..57bf358b2e7c8f2fb39a6db140a462b332946e58 100644 (file)
--- 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 9d7a19581a295a8c0d8a495ced04f9ee449dfad8..829ce4256b76135a48621b6021f4c620aab55a48 100644 (file)
--- 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