From a85b9310ef9e99e9c36ecd10cedb2334d4f6418c Mon Sep 17 00:00:00 2001
From: Jan-Philipp Litza <janphilipp@litza.de>
Date: Sun, 30 Aug 2015 22:22:38 +0200
Subject: [PATCH] Prepare configuration changes for 2015.2

---
 gluon     |  2 +-
 site.conf | 32 ++++++++++++++++++++++++--------
 site.mk   |  1 -
 3 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/gluon b/gluon
index 30677cd..4405f39 160000
--- a/gluon
+++ b/gluon
@@ -1 +1 @@
-Subproject commit 30677cdc385f44005220ed105619d3a4fa9290ce
+Subproject commit 4405f39869071ebd28fe5e9988a745534d6b3461
diff --git a/site.conf b/site.conf
index 5aa2ef2..6b50b49 100644
--- a/site.conf
+++ b/site.conf
@@ -17,20 +17,36 @@
 	regdom = 'DE',
 
 	wifi24 = {
-		ssid = 'bremen.freifunk.net',
 		channel = 6,
 		htmode = 'HT20',
-		mesh_ssid = 'mesh.ffhb.de',
-		mesh_bssid = '32:06:1C:1F:B9:E8',
-		mesh_mcast_rate = 6000,
+		ap = {
+			ssid = 'bremen.freifunk.net',
+		},
+		ibss = {
+			ssid = 'adhoc.ffhb.de',
+			bssid = '32:06:1C:1F:B9:E8',
+			mcast_rate = 6000,
+		},
+		mesh = {
+			id = 'mesh.ffhb.de',
+			mcast_rate = 6000,
+		},
 	},
 	wifi5 = {
-		ssid = 'bremen.freifunk.net',
 		channel = 44,
 		htmode = 'HT40+',
-		mesh_ssid = 'mesh.ffhb.de',
-		mesh_bssid = '32:06:1C:1F:B9:E8',
-		mesh_mcast_rate = 6000,
+		ap = {
+			ssid = 'bremen.freifunk.net',
+		},
+		ibss = {
+			ssid = 'adhoc.ffhb.de',
+			bssid = '32:06:1C:1F:B9:E8',
+			mcast_rate = 6000,
+		},
+		mesh = {
+			id = 'mesh.ffhb.de',
+			mcast_rate = 6000,
+		},
 	},
 
 	next_node = {
diff --git a/site.mk b/site.mk
index 824bdb7..483fecd 100644
--- a/site.mk
+++ b/site.mk
@@ -24,7 +24,6 @@ GLUON_SITE_PACKAGES := \
 	iputils-ping6 \
 	iwinfo \
 	iptables \
-	kmod-ipt-nathelper \
 	firewall \
 	haveged