From 47cd215aeb1f52255e6201278728677d877a9780 Mon Sep 17 00:00:00 2001
From: Bastian <mephisto@mephis.to>
Date: Wed, 29 Mar 2017 19:24:41 +0200
Subject: [PATCH] batman-adv: fix broken double-free backport leading to
 frequent crashes

---
 Makefile | 2 +-
 modules  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index f747bad..59ab5bf 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 GLUON_BUILD_DIR := gluon-build
 GLUON_GIT_URL := https://github.com/freifunk-gluon/gluon.git
-GLUON_GIT_REF := v2016.2.4
+GLUON_GIT_REF := d452a7c2cf1c0da4e034666a50dc0e7aa9ddc592
 
 #https://github.com/freifunk-gluon/gluon/commit/6b8888fe5aebd941c5e7a83a97ceb0678bee4c43
 
diff --git a/modules b/modules
index bd685f2..919b321 100644
--- a/modules
+++ b/modules
@@ -1,7 +1,7 @@
 GLUON_SITE_FEEDS='ffrgb ffhb'
 PACKAGES_FFRGB_REPO=https://github.com/ffrgb/gluon-packages.git
-PACKAGES_FFRGB_BRANCH=v2016.2.x
-PACKAGES_FFRGB_COMMIT=d452a7c2cf1c0da4e034666a50dc0e7aa9ddc592
+PACKAGES_FFRGB_BRANCH=master
+PACKAGES_FFRGB_COMMIT=c9e25956356918d1e91f7e2b8fc716f8b07a789f
 
 PACKAGES_FFHB_REPO=git://github.com/FreifunkBremen/ffhb-packages.git
 PACKAGES_FFHB_COMMIT=8067f787e5272fd7b959be997fc420777bc46414