From a2ba2718086c689f119e8283c3e619bc0675e382 Mon Sep 17 00:00:00 2001
From: Bastian Maeuser <mephisto@mephis.to>
Date: Sun, 15 Jul 2018 00:01:14 +0200
Subject: [PATCH] Introduce 802.11s support

---
 Makefile               | 25 +++++++++++++------------
 domains/ffrgb_cty.conf |  4 ++++
 domains/ffrgb_tst.conf |  4 ++++
 domains/ffrgb_uml.conf |  4 ++++
 site.conf              |  1 -
 site.mk                |  2 +-
 6 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/Makefile b/Makefile
index 8f5af04..f69fb74 100644
--- a/Makefile
+++ b/Makefile
@@ -6,18 +6,19 @@ SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key
 
 GLUON_TARGETS ?= \
 	ar71xx-generic \
-	x86-64 \
-	ar71xx-tiny \
-	ar71xx-nand \
-	brcm2708-bcm2708 \
-	brcm2708-bcm2709 \
-	mpc85xx-generic \
-	ramips-mt7621 \
-	ramips-rt305x \
-	x86-64 \
-	x86-generic \
-	x86-geode \
-	sunxi
+	ar71xx-tiny\
+#	x86-64 \
+#	ar71xx-tiny \
+#	ar71xx-nand \
+#	brcm2708-bcm2708 \
+#	brcm2708-bcm2709 \
+#	mpc85xx-generic \
+#	ramips-mt7621 \
+#	ramips-rt305x \
+#	x86-64 \
+#	x86-generic \
+#	x86-geode \
+#	sunxi
 
 
 GLUON_RELEASE := $(shell git describe --tags 2>/dev/null)
diff --git a/domains/ffrgb_cty.conf b/domains/ffrgb_cty.conf
index 5cdea53..2c842b7 100644
--- a/domains/ffrgb_cty.conf
+++ b/domains/ffrgb_cty.conf
@@ -26,6 +26,10 @@
       bssid = '02:0E:8E:1E:61:01',
       mcast_rate = 12000,
     },
+    mesh = {
+      id = 'loo23eWueg11s',
+      mcast_rate = 12000,
+    },
   },
 
   wifi5 = {
diff --git a/domains/ffrgb_tst.conf b/domains/ffrgb_tst.conf
index c4570a2..e6de552 100644
--- a/domains/ffrgb_tst.conf
+++ b/domains/ffrgb_tst.conf
@@ -27,6 +27,10 @@
       bssid = '02:0E:8E:1E:61:03',
       mcast_rate = 12000,
     },
+    mesh = {
+      id = 'mesh_ffrgb_tst_11s',
+      mcast_rate = 12000,
+    },
   },
 
   wifi5 = {
diff --git a/domains/ffrgb_uml.conf b/domains/ffrgb_uml.conf
index 3d8d911..bc9ccc7 100644
--- a/domains/ffrgb_uml.conf
+++ b/domains/ffrgb_uml.conf
@@ -26,6 +26,10 @@
       bssid = '02:0E:8E:1E:61:02',
       mcast_rate = 12000,
     },
+    mesh = {
+      id = 'Ishei42esh11s',
+      mcast_rate = 12000,
+    },
   },
 
   wifi5 = {
diff --git a/site.conf b/site.conf
index 0b09821..3b874a3 100644
--- a/site.conf
+++ b/site.conf
@@ -25,7 +25,6 @@
   },
 
   mesh_vpn = {
-    mtu = 1426,
     fastd = {
       configurable = true,
       methods = {'salsa2012+umac'},
diff --git a/site.mk b/site.mk
index 7ca10a4..3464eec 100644
--- a/site.mk
+++ b/site.mk
@@ -213,5 +213,5 @@ GLUON_PRIORITY ?= 0
 
 # Languages to include
 GLUON_LANGS ?= en de
-GLUON_WLAN_MESH := ibss
+GLUON_WLAN_MESH := 11s
 GLUON_MULTIDOMAIN=1