From 6187860535442f14c2342d81b2c230cd8d9ba7d9 Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes@sipsolutions.net>
Date: Sat, 23 Feb 2008 15:17:21 +0100
Subject: [PATCH] --- yaml --- r: 90074 b: refs/heads/master c:
 2f5ce793c0817d8d38f1c7ad23945607d57e47d6 h: refs/heads/master v: v3

---
 [refs]                      |  2 +-
 trunk/net/mac80211/Kconfig  | 15 +++++++++++++++
 trunk/net/mac80211/Makefile |  6 ++++++
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 4a338a1448ab..cfc345e91356 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dc0b0f7d1e34b797b98e4d16122b3ea6f775154c
+refs/heads/master: 2f5ce793c0817d8d38f1c7ad23945607d57e47d6
diff --git a/trunk/net/mac80211/Kconfig b/trunk/net/mac80211/Kconfig
index 45c7c0c3875e..57bf358b2e7c 100644
--- a/trunk/net/mac80211/Kconfig
+++ b/trunk/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/trunk/net/mac80211/Makefile b/trunk/net/mac80211/Makefile
index 9d7a19581a29..829ce4256b76 100644
--- a/trunk/net/mac80211/Makefile
+++ b/trunk/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