Set site config

Using service_start requires exporting of environment variables.

Fixes #397

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "site"]
+	path = site
+	url = https://git.dezentrale.cloud/Freifunk-Leipzig/gluon-site

Makefile

@@ -184,6 +184,7 @@ gluon-tools: FORCE
 	+$(GLUONMAKE_EARLY) package/lua/host/install
 
 prepare-tmpinfo: FORCE
+	@+$(MAKE) -r -s tmp/.prereq-build OPENWRT_BUILD= QUIET=0
 	mkdir -p tmp/info
 	$(_SINGLE)$(NO_TRACE_MAKE) -j1 -r -s -f include/scan.mk SCAN_TARGET="packageinfo" SCAN_DIR="package" SCAN_NAME="package" SCAN_DEPS="$(TOPDIR)/include/package*.mk $(TOPDIR)/overlay/*/*.mk" SCAN_EXTRA=""
 	$(_SINGLE)$(NO_TRACE_MAKE) -j1 -r -s -f include/scan.mk SCAN_TARGET="targetinfo" SCAN_DIR="target/linux" SCAN_NAME="target" SCAN_DEPS="profiles/*.mk $(TOPDIR)/include/kernel*.mk $(TOPDIR)/include/target.mk" SCAN_DEPTH=2 SCAN_EXTRA="" SCAN_MAKEOPTS="TARGET_BUILD=1"
@@ -205,7 +206,7 @@ feeds: FORCE
 	+$(GLUONMAKE_EARLY) prepare-tmpinfo
 
 config: FORCE
-	+$(NO_TRACE_MAKE) scripts/config/conf OPENWRT_BUILD=0
+	+$(NO_TRACE_MAKE) scripts/config/conf OPENWRT_BUILD= QUIET=0
 	+$(GLUONMAKE) prepare-tmpinfo
 	( \
 		cat $(GLUONDIR)/include/config $(GLUONDIR)/targets/$(GLUON_TARGET)/config; \

docs/conf.py

@@ -54,9 +54,9 @@ copyright = '2015, Project Gluon'
 # built documents.
 #
 # The short X.Y version.
-version = '2015.1'
+version = '2015.1.2'
 # The full version, including alpha/beta/rc tags.
-release = '2015.1'
+release = '2015.1.2'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

docs/index.rst

@@ -49,6 +49,8 @@ Releases
 .. toctree::
    :maxdepth: 1
 
+   releases/v2015.1.2
+   releases/v2015.1.1
    releases/v2015.1
    releases/v2014.4
    releases/v2014.3.1
@@ -100,9 +102,10 @@ ar71xx-generic
   - TL-MR3040 (v1, v2)
   - TL-MR3220 (v1, v2)
   - TL-MR3420 (v1, v2)
-  - TL-WA701N/ND (v1)
+  - TL-WA701N/ND (v1, v2)
   - TL-WA750RE (v1)
-  - TL-WA801N/ND (v2)
+  - TL-WA801N/ND (v1, v2)
+  - TL-WA830RE (v1, v2)
   - TL-WA850RE (v1)
   - TL-WA860RE (v1)
   - TL-WA901N/ND (v2, v3)
@@ -112,8 +115,8 @@ ar71xx-generic
   - TL-WR1043N/ND (v1, v2)
   - TL-WR703N (v1)
   - TL-WR710N (v1)
-  - TL-WR740N (v1, v3, v4)
-  - TL-WR741N/ND (v1, v2, v4)
+  - TL-WR740N (v1, v3, v4, v5)
+  - TL-WR741N/ND (v1, v2, v4, v5)
   - TL-WR743N/ND (v1, v2)
   - TL-WR841N/ND (v3, v5, v7, v8, v9)
   - TL-WR842N/ND (v1, v2)

docs/releases/v2015.1.1.rst

@@ -0,0 +1,27 @@
+Gluon 2015.1.1
+==============
+
+Added hardware support
+~~~~~~~~~~~~~~~~~~~~~~
+ar71xx-generic
+^^^^^^^^^^^^^^
+
+* TP-Link
+
+  - TL-WA830RE (v1)
+
+New features
+~~~~~~~~~~~~
+The `x86-generic` and `x86-kvm_guest` images now support two ethernet interfaces by default. If two interfaces exist during
+the first boot, `eth0` will be used as LAN and `eth1` as WAN.
+
+Bugfixes
+~~~~~~~~
+
+* Fix German "Expert Mode" label (was "Export Mode")
+* Fix download of OpenSSL during build (because of broken OpenSSL download servers...)
+* Fix ABI break causing kernel panics when trying to use network-related modules from the official OpenWrt repository (like `kmod-pppoe`)
+* Fix race conditions breaking parallel build occasionally
+* A broken network configuration would be generated when an older Gluon version was updated to 2015.1 with
+  ``mesh_on_lan`` enabled in `site.conf`
+* Minor announced/alfred JSON format fixes (don't output empty lists where empty objects would be expected)

docs/releases/v2015.1.2.rst

@@ -0,0 +1,41 @@
+Gluon 2015.1.2
+==============
+
+Added hardware support
+~~~~~~~~~~~~~~~~~~~~~~
+ar71xx-generic
+^^^^^^^^^^^^^^
+
+* TP-Link
+
+  - TL-WA701N/ND (v2)
+  - TL-WA801N/ND (v1)
+  - TL-WA830RE (v2)
+  - TL-WR740N / TL-WR741ND (v5)
+
+New features
+~~~~~~~~~~~~
+
+* Ubiquiti Loco M, Picostation M and Rocket M now get their own images (which are just copies of the Bullet M image)
+  so it's more obvious for users which image to use
+* The x86-generic images now contain the e1000e ethernet driver by default
+
+Bugfixes
+~~~~~~~~
+
+* Fix download of OpenSSL during build because of broken OpenSSL download servers (again...)
+* Fix another ABI incompatiblity with the upstream kernel modules which prevented loading some filesystem-related modules
+* Fix potential MAC address conflicts on x86 target when using mesh-on-wan/lan
+* Fix signal strength indicators on TP-LINK CPE210/510
+* Fix the model name string on some NETGEAR WNDR3700v2
+* Fix 5GHz WLAN switching channels and losing connectivity when other WLANs using the same channel are detected (including other Gluon nodes...); see https://github.com/freifunk-gluon/gluon/issues/386
+* Fix DNS resolution for mesh VPN on IPv6-only WAN; see https://github.com/freifunk-gluon/gluon/issues/397
+* gluon-mesh-batman-adv-15: update batman-adv to 2015.0 with additional bugfixes (fixes various minor bugs)
+* gluon-mesh-batman-adv-15: fix forwarding of fragmented frames over multiple links with different MTUs
+
+  batman-adv compat 15 doesn't re-fragment frames that are fragmented already. In particular,
+  this breaks transmission of large packets which are first fragmented for mesh-on-lan/wan and are then sent
+  over the mesh VPN, which has an even smaller MTU. Work around this limitation by decreasing the maximum fragment
+  size to 1280, so they can always be forwarded as long there's no link with a MTU smaller than 1280.
+
+  See https://github.com/freifunk-gluon/gluon/issues/435

include/config

@@ -15,6 +15,8 @@ CONFIG_BUSYBOX_CONFIG_FEATURE_IP_RULE=y
 CONFIG_BUSYBOX_CONFIG_FEATURE_IP_SHORT_FORMS=y
 CONFIG_BUSYBOX_CONFIG_FEATURE_WGET_TIMEOUT=y
 
+CONFIG_KERNEL_DIRECT_IO=y
+
 CONFIG_ATH_USER_REGD=y
 CONFIG_PACKAGE_ATH_DEBUG=y
 CONFIG_ATH10K_CT_COMMUNITY_FW=y

include/toplevel.mk

@@ -48,10 +48,6 @@ else
   export HOSTCC_WRAPPER:=$(HOSTCC)
 endif
 
-ifeq ($(FORCE),)
-  .config scripts/config/conf scripts/config/mconf: tmp/.prereq-build
-endif
-
 SCAN_COOKIE?=$(shell echo $$$$)
 export SCAN_COOKIE
 

modules

@@ -1,10 +1,10 @@
 GLUON_FEEDS='openwrt gluon routing luci'
 
 OPENWRT_REPO=git://git.openwrt.org/14.07/openwrt.git
-OPENWRT_COMMIT=179bab8b1700d74b28cc6cd25322f9a1ad670107
+OPENWRT_COMMIT=10b1d597b97bf9038d18eb8c7c5a8d127c72e5da
 
 PACKAGES_OPENWRT_REPO=git://github.com/openwrt/packages.git
-PACKAGES_OPENWRT_COMMIT=01fcd1f29174a56d6ddb59901ed8c67ea42c3a8f
+PACKAGES_OPENWRT_COMMIT=289cc1505143e4b6cfaaabd452143e159dd22d25
 PACKAGES_OPENWRT_BRANCH=for-14.07
 
 PACKAGES_GLUON_REPO=git://github.com/freifunk-gluon/packages.git

package/gluon-announce/files/usr/lib/lua/gluon/announce.lua

@@ -3,6 +3,7 @@
 module('gluon.announce', package.seeall)
 
 fs = require 'luci.fs'
+json = require 'luci.json'
 uci = require('luci.model.uci').cursor()
 util = require 'luci.util'
 
@@ -15,7 +16,7 @@ local function collect_entry(entry)
 end
 
 function collect_dir(dir)
-	local ret = {}
+	local ret = { [json.null] = true }
 
 	for _, entry in ipairs(fs.dir(dir)) do
 		if entry:sub(1, 1) ~= '.' then

package/gluon-config-mode-geo-location/i18n/de.po

@@ -27,7 +27,7 @@ msgid "Longitude"
 msgstr "Längengrad"
 
 msgid "Altitude"
-msgstr "Höhenmeter über Normalnull"
+msgstr "Höhe"
 
 msgid "Show node on the map"
 msgstr "Knoten auf der Karte anzeigen"

package/gluon-core/files/lib/gluon/upgrade/010-primary-mac

@@ -15,19 +15,18 @@ local util = require 'luci.util'
 
 
 local try_files = {
-  '/sys/class/ieee80211/phy0/macaddress',
-  '/sys/class/net/eth0/address',
+  '/sys/class/net/eth0/address'
 }
 
+if not util.contains({'x86', 'brcm2708'}, platform.get_target()) then
+  table.insert(try_files, 1, '/sys/class/ieee80211/phy0/macaddress')
+end
+
 if platform.match('ar71xx', 'generic', {'tl-wdr3600', 'tl-wdr4300'}) then
   table.insert(try_files, 1, '/sys/class/ieee80211/phy1/macaddress')
-end
-
-if platform.match('ar71xx', 'generic', {'unifi-outdoor-plus'}) then
+elseif platform.match('ar71xx', 'generic', {'unifi-outdoor-plus'}) then
   table.insert(try_files, 1, '/sys/class/net/eth0/address')
-end
-
-if platform.match('ar71xx', 'generic', {'archer-c5', 'archer-c7'}) then
+elseif platform.match('ar71xx', 'generic', {'archer-c5', 'archer-c7'}) then
   table.insert(try_files, 1, '/sys/class/net/eth1/address')
 end
 

package/gluon-luci-admin/i18n/de.po

@@ -27,7 +27,7 @@ msgid "Don't switch off the device in any circumstance!"
 msgstr "Unterbrich auf keinen Fall die Stromversorgung!"
 
 msgid "Expert Mode"
-msgstr "Export Mode"
+msgstr "Expert Mode"
 
 msgid "Firmware image"
 msgstr "Firmware-Datei"

package/gluon-mesh-batman-adv-core/files/lib/gluon/announce/neighbours.d/batadv

@@ -1,7 +1,3 @@
-local json = require 'luci.json'
-local util = require 'luci.util'
-local fs = require 'nixio.fs'
-
 local ifname_address_cache = {}
 
 function ifname2address(ifname)
@@ -26,7 +22,7 @@ function batadv()
     if mac1 ~= nil and mac1 == mac2 then
       ifaddress = ifname2address(ifname)
       if interfaces[ifaddress] == nil then
-        interfaces[ifaddress] = { neighbours = {} }
+        interfaces[ifaddress] = { neighbours = { [json.null] = true } }
       end
 
       interfaces[ifaddress].neighbours[mac1] = { tq = tonumber(tq)
@@ -35,7 +31,9 @@ function batadv()
     end
   end
 
-  return interfaces
+  if next(interfaces) then
+    return interfaces
+  end
 end
 
 return batadv()

package/gluon-mesh-batman-adv-core/files/lib/gluon/announce/neighbours.d/wifi

@@ -1,6 +1,3 @@
-local json = require 'luci.json'
-local util = require 'luci.util'
-local fs = require 'nixio.fs'
 local iwinfo = require 'iwinfo'
 
 function neighbours(iface)
@@ -12,7 +9,9 @@ function neighbours(iface)
                           }
   end
 
-  return stations
+  if next(stations) then
+    return stations
+  end
 end
 
 function interfaces()
@@ -38,4 +37,6 @@ for address, iface in pairs(interfaces()) do
   wifi[address] = { neighbours = neighbours(iface) }
 end
 
-return wifi
+if next(wifi) then
+  return wifi
+end

package/gluon-mesh-batman-adv-core/files/lib/gluon/announce/nodeinfo.d/network/mesh/bat0/interfaces

@@ -48,5 +48,6 @@ end
 return {
   wireless = nil_table(wireless),
   tunnel = nil_table(tunnel),
-  other = nil_table(other)
+  other = nil_table(other),
+  [json.null] = true
 }

package/gluon-mesh-batman-adv-core/files/lib/gluon/upgrade/300-gluon-mesh-batman-adv-core-wan

@@ -1,14 +1,11 @@
 #!/usr/bin/lua
 
-local sysconfig = require 'gluon.sysconfig'
 local util = require 'gluon.util'
 local uci = require('luci.model.uci').cursor()
 
 
-if sysconfig.wan_ifname:match('%.') then
-  -- fix up duplicate mac addresses (for mesh-on-WAN)
-  uci:set('network', 'wan', 'macaddr', util.generate_mac(1, 0))
-  uci:save('network')
-  uci:commit('network')
-end
+-- fix up duplicate mac addresses (for mesh-on-WAN)
+uci:set('network', 'wan', 'macaddr', util.generate_mac(1, 0))
+uci:save('network')
+uci:commit('network')
 

package/gluon-mesh-batman-adv-core/files/lib/gluon/upgrade/340-gluon-mesh-batman-adv-core-mesh-on-lan

@@ -1,23 +1,32 @@
 #!/usr/bin/lua
 
 local site = require 'gluon.site_config'
-local uci = require 'luci.model.uci'
 local util = require 'gluon.util'
 local sysconfig = require 'gluon.sysconfig'
 
-local c = uci.cursor()
+local uci = require('luci.model.uci').cursor()
+local lutil = require 'luci.util'
 
-if sysconfig.lan_ifname then
-  if not c:get('network', 'mesh_lan') then
-    c:section('network', 'interface', 'mesh_lan',
+if sysconfig.lan_ifname and not uci:get('network', 'mesh_lan') then
+  local enable = site.mesh_on_lan
+
+  if enable then
+    local interfaces = uci:get('network', 'client', 'ifname')
+
+    if interfaces and lutil.contains(interfaces:split(' '), sysconfig.lan_ifname) then
+      enable = false
+    end
+  end
+
+  uci:section('network', 'interface', 'mesh_lan',
               { ifname  = sysconfig.lan_ifname
               , proto   = 'batadv'
               , mesh    = 'bat0'
               , macaddr = util.generate_mac(1, 1)
-              , auto    = site.mesh_on_lan and 1 or 0
-              })
-  end
+              , auto    = enable and 1 or 0
+  })
+
+  uci:save('network')
+  uci:commit('network')
 end
 
-c:save('network')
-c:commit('network')

package/gluon-mesh-batman-adv-core/files/lib/gluon/upgrade/350-gluon-mesh-batman-adv-core-rssid

@@ -0,0 +1,10 @@
+#!/usr/bin/lua
+
+local uci = require('luci.model.uci').cursor()
+
+if uci:get('system', 'rssid_wlan0') then
+  uci:set('system', 'rssid_wlan0', 'dev', 'mesh0')
+
+  uci:save('system')
+  uci:commit('system')
+end

package/gluon-wan-dnsmasq/files/etc/init.d/gluon-wan-dnsmasq

@@ -18,7 +18,10 @@ start() {
 	mkdir -p $RESOLV_CONF_DIR
 	/lib/gluon/wan-dnsmasq/update.lua
 
-	LD_PRELOAD=libpacketmark.so LIBPACKETMARK_MARK=$PACKET_MARK service_start /usr/sbin/dnsmasq -x $SERVICE_PID_FILE -u root -i lo -p $PORT -h -r $RESOLV_CONF
+	export LD_PRELOAD=libpacketmark.so
+	export LIBPACKETMARK_MARK=$PACKET_MARK
+
+	service_start /usr/sbin/dnsmasq -x $SERVICE_PID_FILE -u root -i lo -p $PORT -h -r $RESOLV_CONF
 }
 
 stop() {

patches/openwrt/0036-build-prevent-race-condition-between-tool-symlink-creation.patch

@@ -0,0 +1,20 @@
+From: Matthias Schiffer <mschiffer@universe-factory.net>
+Date: Thu, 28 May 2015 03:48:14 +0200
+Subject: build: prevent race condition between tool symlink creation
+
+Filter out STAGING_DIR_HOST binary path to prevent picking up grep from this
+path.
+
+diff --git a/tools/Makefile b/tools/Makefile
+index 137ad61..c24bca1 100644
+--- a/tools/Makefile
++++ b/tools/Makefile
+@@ -120,7 +120,7 @@ $(STAGING_DIR_HOST)/.prepared: $(TMP_DIR)/.build
+ define PrepareCommand
+ $(STAGING_DIR_HOST)/bin/$(1): $(STAGING_DIR_HOST)/.prepared
+ 	@mkdir -p "$$(dir $$@)"; rm -f "$$@"
+-	@export FILE="$$$$(which $(2) 2>/dev/null | grep -v 'not found' | head -n1)"; [ -n "$$$$FILE" ] || { \
++	@export PATH="$(subst $(space),:,$(filter-out $(STAGING_DIR_HOST)/%,$(subst :,$(space),$(PATH))))"; export FILE="$$$$(which $(2) 2>/dev/null | grep -v 'not found' | head -n1)"; [ -n "$$$$FILE" ] || { \
+ 		echo "Command $(1) not found."; false; \
+ 	}; ln -s "$$$$FILE" "$$@"
+ 

patches/openwrt/0037-ar71xx-fix-AR71XX_MODEL-for-TP-Link-TL-WA830RE-v1.patch

@@ -0,0 +1,24 @@
+From: Matthias Schiffer <mschiffer@universe-factory.net>
+Date: Mon, 15 Jun 2015 21:28:06 +0200
+Subject: ar71xx: fix AR71XX_MODEL for TP-Link TL-WA830RE v1
+
+The v1 identifies as v10 internally. As there is no TL-WA830RE v10, add a
+workaround to avoid confusing users.
+
+Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
+
+diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh
+index 1838cb4..d79776b 100755
+--- a/target/linux/ar71xx/base-files/lib/ar71xx.sh
++++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh
+@@ -145,6 +145,10 @@ tplink_board_detect() {
+ 		;;
+ 	"083000"*)
+ 		model="TP-Link TL-WA830RE"
++
++		if [ "$hwver" = 'v10' ]; then
++			hwver='v1'
++		fi
+ 		;;
+ 	"084100"*)
+ 		model="TP-Link TL-WR841N/ND"

patches/openwrt/0038-x86-remove-old-soekris-config-hacks-install-a-more-appropriate-default-etc-config-network-with-lan-wan.patch

@@ -0,0 +1,137 @@
+From: Matthias Schiffer <mschiffer@universe-factory.net>
+Date: Tue, 16 Jun 2015 01:07:41 +0200
+Subject: x86: remove old soekris config hacks, install a more appropriate default /etc/config/network with lan+wan
+
+Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+
+diff --git a/target/linux/x86/base-files/etc/config/network b/target/linux/x86/base-files/etc/config/network
+new file mode 100644
+index 0000000..c9953a0
+--- /dev/null
++++ b/target/linux/x86/base-files/etc/config/network
+@@ -0,0 +1,26 @@
++# Copyright (C) 2006 OpenWrt.org
++
++config interface loopback
++	option ifname	lo
++	option proto	static
++	option ipaddr	127.0.0.1
++	option netmask	255.0.0.0
++
++config interface lan
++	option ifname	eth0
++	option type 	bridge
++	option proto	static
++	option ipaddr	192.168.1.1
++	option netmask	255.255.255.0
++	option ip6assign 60
++
++config interface wan
++	option ifname	eth1
++	option proto	dhcp
++
++config interface wan6
++	option ifname	eth1
++	option proto	dhcpv6
++
++config globals globals
++	option ula_prefix auto
+diff --git a/target/linux/x86/base-files/etc/defconfig/net4801/network b/target/linux/x86/base-files/etc/defconfig/net4801/network
+deleted file mode 100644
+index 172d513..0000000
+--- a/target/linux/x86/base-files/etc/defconfig/net4801/network
++++ /dev/null
+@@ -1,24 +0,0 @@
+-config interface loopback
+-	option ifname	lo
+-	option proto	static
+-	option ipaddr	127.0.0.1
+-	option netmask	255.0.0.0
+-
+-config interface lan
+-	option ifname	eth1
+-	option type	bridge
+-	option proto	static
+-	option ipaddr	192.168.1.1
+-	option netmask	255.255.255.0
+-	option ip6assign 60
+-
+-config interface wan
+-	option ifname	eth0
+-	option proto	dhcp
+-
+-config interface wan6
+-	option ifname   @wan
+-	option proto    dhcpv6
+-
+-config globals globals
+-	option ula_prefix auto
+diff --git a/target/linux/x86/base-files/etc/defconfig/net4826/network b/target/linux/x86/base-files/etc/defconfig/net4826/network
+deleted file mode 100644
+index 7c9fb63..0000000
+--- a/target/linux/x86/base-files/etc/defconfig/net4826/network
++++ /dev/null
+@@ -1,12 +0,0 @@
+-config interface loopback
+-	option ifname	lo
+-	option proto	static
+-	option ipaddr	127.0.0.1
+-	option netmask	255.0.0.0
+-
+-config interface lan
+-	option ifname	eth0
+-	option type	bridge
+-	option proto	static
+-	option ipaddr	192.168.1.1
+-	option netmask	255.255.255.0
+diff --git a/target/linux/x86/base-files/etc/init.d/defconfig b/target/linux/x86/base-files/etc/init.d/defconfig
+deleted file mode 100755
+index 4b4f28f..0000000
+--- a/target/linux/x86/base-files/etc/init.d/defconfig
++++ /dev/null
+@@ -1,20 +0,0 @@
+-#!/bin/sh /etc/rc.common
+-#
+-# Copyright (C) 2010 Thinktube Inc.
+-#
+-
+-START=05
+-
+-start() {
+-	. /lib/soekris.sh
+-
+-	local board=$(net48xx_board_name)
+-
+-	[ ! -d /etc/defconfig/$board ] && board="net4826"
+-
+-	for f in $( ls /etc/defconfig/$board ); do
+-		if [ ! -e /etc/config/$f ]; then
+-			cp /etc/defconfig/$board/$f /etc/config/
+-		fi
+-	done
+-}
+diff --git a/target/linux/x86/base-files/lib/soekris.sh b/target/linux/x86/base-files/lib/soekris.sh
+deleted file mode 100755
+index e416ad3..0000000
+--- a/target/linux/x86/base-files/lib/soekris.sh
++++ /dev/null
+@@ -1,19 +0,0 @@
+-#!/bin/sh
+-
+-net48xx_board_name () {
+-    local name
+-    local pci=`wc -l /proc/bus/pci/devices`
+-
+-    case "$pci" in
+-	*"8"*)
+-	    name="net4826"
+-	    ;;
+-	*1[0-4]*)
+-	    name="net4801"
+-	    ;;
+-	*)
+-	    name="net4826"
+-	    ;;
+-    esac
+-    echo $name
+-}

patches/openwrt/0039-Revert-netns_ct-ABI-change-introduced-in-r44874.patch

@@ -0,0 +1,20 @@
+From: Matthias Schiffer <mschiffer@universe-factory.net>
+Date: Wed, 17 Jun 2015 00:03:39 +0200
+Subject: Revert netns_ct ABI change introduced in r44874
+
+diff --git a/target/linux/generic/patches-3.10/617-netfilter_skip_filter_compat.patch b/target/linux/generic/patches-3.10/617-netfilter_skip_filter_compat.patch
+new file mode 100644
+index 0000000..dce0cd0
+--- /dev/null
++++ b/target/linux/generic/patches-3.10/617-netfilter_skip_filter_compat.patch
+@@ -0,0 +1,10 @@
++--- a/include/net/netns/conntrack.h
+++++ b/include/net/netns/conntrack.h
++@@ -80,6 +80,7 @@ struct netns_ct {
++ 	int			sysctl_acct;
++ 	int			sysctl_tstamp;
++ 	int			sysctl_checksum;
+++	int			skip_filter;
++ 	unsigned int		sysctl_log_invalid; /* Log invalid packets */
++ 	int			sysctl_auto_assign_helper;
++ 	bool			auto_assign_helper_warned;

patches/openwrt/0040-ar71xx-add-support-for-TP-LINK-TL-WR740N-TL-WR741ND.patch

@@ -0,0 +1,28 @@
+From: Matthias Schiffer <mschiffer@universe-factory.net>
+Date: Mon, 22 Jun 2015 00:50:09 +0200
+Subject: ar71xx: add support for TP-LINK TL-WR740N/TL-WR741ND
+
+diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile
+index fc59c33..53ae3f6 100644
+--- a/target/linux/ar71xx/image/Makefile
++++ b/target/linux/ar71xx/image/Makefile
+@@ -1233,6 +1233,8 @@ $(eval $(call SingleProfile,TPLINK-LZMA,64kraw,TLWR710,tl-wr710n-v1,TL-WR710N,tt
+ $(eval $(call SingleProfile,TPLINK-LZMA,64kraw,TLWR720NV3,tl-wr720n-v3,TL-WR720N-v3,ttyATH0,115200,0x07200103,1,4Mlzma))
+ $(eval $(call SingleProfile,TPLINK-LZMA,64kraw,TLWR740NV4,tl-wr740n-v4,TL-WR741ND-v4,ttyATH0,115200,0x07400004,1,4Mlzma))
+ $(eval $(call SingleProfile,TPLINK-LZMA,64kraw,TLWR741NV4,tl-wr741nd-v4,TL-WR741ND-v4,ttyATH0,115200,0x07410004,1,4Mlzma))
++$(eval $(call SingleProfile,TPLINK-LZMA,64kraw,TLWR740NV5,tl-wr740n-v5,TL-WR741ND-v4,ttyATH0,115200,0x07400005,1,4Mlzma))
++$(eval $(call SingleProfile,TPLINK-LZMA,64kraw,TLWR741NV5,tl-wr741nd-v5,TL-WR741ND-v4,ttyATH0,115200,0x07400005,1,4Mlzma))
+ $(eval $(call SingleProfile,TPLINK-LZMA,64kraw,TLWR743NV2,tl-wr743nd-v2,TL-WR741ND-v4,ttyATH0,115200,0x07430002,1,4Mlzma))
+ $(eval $(call SingleProfile,TPLINK-LZMA,64kraw,TLWA750,tl-wa750re-v1,TL-WA750RE,ttyS0,115200,0x07500001,1,4Mlzma))
+ $(eval $(call SingleProfile,TPLINK-LZMA,64kraw,TLWR841NV8,tl-wr841n-v8,TL-WR841N-v8,ttyS0,115200,0x08410008,1,4Mlzma))
+@@ -1318,8 +1320,8 @@ $(eval $(call MultiProfile,TLWA830,TLWA830RV1 TLWA830RV2))
+ $(eval $(call MultiProfile,TLWA901,TLWA901NV1 TLWA901NV2 TLWA901NV3))
+ $(eval $(call MultiProfile,TLWA7510,TLWA7510NV1))
+ $(eval $(call MultiProfile,TLWR720,TLWR720NV3))
+-$(eval $(call MultiProfile,TLWR740,TLWR740NV1 TLWR740NV3 TLWR740NV4))
+-$(eval $(call MultiProfile,TLWR741,TLWR741NV1 TLWR741NV2 TLWR741NV4))
++$(eval $(call MultiProfile,TLWR740,TLWR740NV1 TLWR740NV3 TLWR740NV4 TLWR740NV5))
++$(eval $(call MultiProfile,TLWR741,TLWR741NV1 TLWR741NV2 TLWR741NV4 TLWR741NV5))
+ $(eval $(call MultiProfile,TLWR743,TLWR743NV1 TLWR743NV2))
+ $(eval $(call MultiProfile,TLWR841,TLWR841NV15 TLWR841NV3 TLWR841NV5 TLWR841NV7 TLWR841NV8 TLWR841NV9))
+ $(eval $(call MultiProfile,TLWR842,TLWR842V1 TLWR842V2))

patches/openwrt/0041-ar71xx-fix-wndr3700_board_detect-for-some-NETGEAR-WNDR3700v2.patch

@@ -0,0 +1,26 @@
+From: Matthias Schiffer <mschiffer@universe-factory.net>
+Date: Thu, 23 Jul 2015 01:31:05 +0200
+Subject: ar71xx: fix wndr3700_board_detect for some NETGEAR WNDR3700v2
+
+There are a few NETGEAR devices which don't terminate the model name in the
+ART with a NUL byte, at least some NETGEAR WNDR3700v2. The current awk
+expression doesn't match 0xFF bytes, so AR71XX_MODEL contains lots of
+trailing 0xFF garbage in this case.
+
+Fix this by matching for the first non-printable character and explicitly
+setting LC_CTYPE=C (probably not strictly necessary on OpenWrt, but will
+definitely work like this, even when awk supports locales and LANG is set).
+
+diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh
+index d79776b..6ba40aa 100755
+--- a/target/linux/ar71xx/base-files/lib/ar71xx.sh
++++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh
+@@ -38,7 +38,7 @@ wndr3700_board_detect() {
+ 		;;
+ 	"33373031")
+ 		# Use awk to remove everything after the first zero byte
+-		model="$(ar71xx_get_mtd_offset_size_format art 41 32 %c | awk 'BEGIN{FS="[[:cntrl:]]"} {print $1; exit}')"
++		model="$(ar71xx_get_mtd_offset_size_format art 41 32 %c | LC_CTYPE=C awk -v 'FS=[^[:print:]]' '{print $1; exit}')"
+ 		case $model in
+ 		$'\xff'*)
+ 			if [ "${model:24:1}" = 'N' ]; then

patches/openwrt/0042-hostapd-prevent-channel-switch-for-5GHz.patch

@@ -0,0 +1,77 @@
+From: Matthias Schiffer <mschiffer@universe-factory.net>
+Date: Mon, 27 Jul 2015 20:42:50 +0200
+Subject: hostapd: prevent channel switch for 5GHz
+
+hostapd would switch the primary and secondary channel on 5GHz networks in
+certain circumstances, completely breaking the adhoc interfaces of the WLAN
+adapter (they would lose their configuration).
+
+As a temporary fix, disable this channel switch function.
+
+diff --git a/package/network/services/hostapd/patches/472-no_channel_switch.patch b/package/network/services/hostapd/patches/472-no_channel_switch.patch
+new file mode 100644
+index 0000000..046969b
+--- /dev/null
++++ b/package/network/services/hostapd/patches/472-no_channel_switch.patch
+@@ -0,0 +1,61 @@
++--- a/src/ap/hw_features.c
+++++ b/src/ap/hw_features.c
++@@ -339,58 +339,6 @@ static int ieee80211n_check_40mhz_5g(str
++ 	else
++ 		sec_freq = pri_freq - 20;
++ 
++-	/*
++-	 * Switch PRI/SEC channels if Beacons were detected on selected SEC
++-	 * channel, but not on selected PRI channel.
++-	 */
++-	pri_bss = sec_bss = 0;
++-	for (i = 0; i < scan_res->num; i++) {
++-		struct wpa_scan_res *bss = scan_res->res[i];
++-		if (bss->freq == pri_freq)
++-			pri_bss++;
++-		else if (bss->freq == sec_freq)
++-			sec_bss++;
++-	}
++-	if (sec_bss && !pri_bss) {
++-		wpa_printf(MSG_INFO, "Switch own primary and secondary "
++-			   "channel to get secondary channel with no Beacons "
++-			   "from other BSSes");
++-		ieee80211n_switch_pri_sec(iface);
++-		return 1;
++-	}
++-
++-	/*
++-	 * Match PRI/SEC channel with any existing HT40 BSS on the same
++-	 * channels that we are about to use (if already mixed order in
++-	 * existing BSSes, use own preference).
++-	 */
++-	match = 0;
++-	for (i = 0; i < scan_res->num; i++) {
++-		struct wpa_scan_res *bss = scan_res->res[i];
++-		ieee80211n_get_pri_sec_chan(bss, &bss_pri_chan, &bss_sec_chan);
++-		if (pri_chan == bss_pri_chan &&
++-		    sec_chan == bss_sec_chan) {
++-			match = 1;
++-			break;
++-		}
++-	}
++-	if (!match) {
++-		for (i = 0; i < scan_res->num; i++) {
++-			struct wpa_scan_res *bss = scan_res->res[i];
++-			ieee80211n_get_pri_sec_chan(bss, &bss_pri_chan,
++-						    &bss_sec_chan);
++-			if (pri_chan == bss_sec_chan &&
++-			    sec_chan == bss_pri_chan) {
++-				wpa_printf(MSG_INFO, "Switch own primary and "
++-					   "secondary channel due to BSS "
++-					   "overlap with " MACSTR,
++-					   MAC2STR(bss->bssid));
++-				ieee80211n_switch_pri_sec(iface);
++-				break;
++-			}
++-		}
++-	}
++-
++ 	return 1;
++ }
++ 

patches/packages/luci/0003-luci-lib-json-ignore-null-keys-to-allow-encoding-empty-objects.patch

@@ -0,0 +1,36 @@
+From: Matthias Schiffer <mschiffer@universe-factory.net>
+Date: Thu, 4 Jun 2015 21:03:24 +0200
+Subject: luci-lib-json: ignore null keys to allow encoding empty objects
+
+There is currently no way to encode an empty object {}, as empty tables are
+encoded as empty lists [].
+
+With this patch, encode() will ignore table fields with the key json.null (which
+doesn't make sense anyways). This allows adding a field with key json.null to
+force encoding it as an object.
+
+Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
+
+diff --git a/libs/json/luasrc/json.lua b/libs/json/luasrc/json.lua
+index 8dbaf91..11a5608 100644
+--- a/libs/json/luasrc/json.lua
++++ b/libs/json/luasrc/json.lua
+@@ -205,11 +205,13 @@ function Encoder.parse_iter(self, obj)
+ 		local first = true
+ 
+ 		for key, entry in pairs(obj) do
+-			first = first or self:put(",")
+-			first = first and false
+-			self:parse_string(tostring(key))
+-			self:put(":")
+-			self:dispatch(entry)
++			if key ~= null then
++				first = first or self:put(",")
++				first = first and false
++				self:parse_string(tostring(key))
++				self:put(":")
++				self:dispatch(entry)
++			end
+ 		end
+ 
+ 		self:put("}")

patches/packages/routing/0001-Update-batman-adv-and-alfred-to-v2014.4.patch

@@ -1,52 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Wed, 7 Jan 2015 16:40:43 +0100
-Subject: Update batman-adv and alfred to v2014.4
-
-diff --git a/alfred/Makefile b/alfred/Makefile
-index 648a5ef..0a5fcac 100644
---- a/alfred/Makefile
-+++ b/alfred/Makefile
-@@ -11,9 +11,9 @@ include $(TOPDIR)/rules.mk
- # The latest alfred git hash in PKG_REV can be obtained from http://git.open-mesh.org/alfred.git
- #
- PKG_NAME:=alfred
--PKG_VERSION:=2014.3.0
-+PKG_VERSION:=2014.4.0
- PKG_RELEASE:=0
--PKG_MD5SUM:=b8ab5677ed73d817b02b0e4fae10357a
-+PKG_MD5SUM:=053cb5d9e7ca9384598e82944343dea2
- 
- PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
- PKG_SOURCE_URL:=http://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION)
-diff --git a/batctl/Makefile b/batctl/Makefile
-index ae22286..1009b03 100644
---- a/batctl/Makefile
-+++ b/batctl/Makefile
-@@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk
- 
- PKG_NAME:=batctl
- 
--PKG_VERSION:=2014.2.0
-+PKG_VERSION:=2014.4.0
- PKG_RELEASE:=1
--PKG_MD5SUM:=c196cf95b7324d9123b701a56b06b31d
-+PKG_MD5SUM:=f3a14565699313258ee6ba3de783eb0a
- 
- PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
- PKG_SOURCE_URL:=http://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION)
-diff --git a/batman-adv/Makefile b/batman-adv/Makefile
-index 889dea7..0d5ed33 100644
---- a/batman-adv/Makefile
-+++ b/batman-adv/Makefile
-@@ -10,9 +10,9 @@ include $(TOPDIR)/rules.mk
- 
- PKG_NAME:=batman-adv
- 
--PKG_VERSION:=2014.2.0
-+PKG_VERSION:=2014.4.0
- PKG_RELEASE:=1
--PKG_MD5SUM:=1243029b3a3e2f4fa721d1a59c2faaf5
-+PKG_MD5SUM:=b1518e84ce530883d224c6ca4c673ce8
- 
- PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
- PKG_SOURCE_URL:=http://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION)

patches/packages/routing/0002-alfred-adjust-intervals.patch

@@ -1,25 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Wed, 7 Jan 2015 16:45:09 +0100
-Subject: alfred: adjust intervals
-
-diff --git a/alfred/patches/0001-alfred-adjust-intervals.patch b/alfred/patches/0001-alfred-adjust-intervals.patch
-new file mode 100644
-index 0000000..a8e0b4d
---- /dev/null
-+++ b/alfred/patches/0001-alfred-adjust-intervals.patch
-@@ -0,0 +1,15 @@
-+--- a/alfred.h
-++++ b/alfred.h
-+@@ -32,10 +32,10 @@
-+ #include "list.h"
-+ #include "packet.h"
-+ 
-+-#define ALFRED_INTERVAL			10
-++#define ALFRED_INTERVAL			60
-+ #define ALFRED_IF_CHECK_INTERVAL	60
-+ #define ALFRED_REQUEST_TIMEOUT		10
-+-#define ALFRED_SERVER_TIMEOUT		60
-++#define ALFRED_SERVER_TIMEOUT		180
-+ #define ALFRED_DATA_TIMEOUT		600
-+ #define ALFRED_SOCK_PATH_DEFAULT	"/var/run/alfred.sock"
-+ #define NO_FILTER			-1

patches/packages/routing/0003-batman-adv-introduce-no_rebroadcast-option.patch

@@ -1,221 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Thu, 2 Apr 2015 20:24:14 +0200
-Subject: batman-adv: introduce 'no_rebroadcast' option
-
-diff --git a/batman-adv/files/lib/netifd/proto/batadv.sh b/batman-adv/files/lib/netifd/proto/batadv.sh
-index 632a209..01f567f 100644
---- a/batman-adv/files/lib/netifd/proto/batadv.sh
-+++ b/batman-adv/files/lib/netifd/proto/batadv.sh
-@@ -6,16 +6,19 @@ init_proto "$@"
- 
- proto_batadv_init_config() {
- 	proto_config_add_string "mesh"
-+	proto_config_add_string "mesh_no_rebroadcast"
- }
- 
- proto_batadv_setup() {
- 	local config="$1"
- 	local iface="$2"
- 
--	local mesh
--	json_get_vars mesh
-+	local mesh mesh_no_rebroadcast
-+	json_get_vars mesh mesh_no_rebroadcast
- 
- 	echo "$mesh" > "/sys/class/net/$iface/batman_adv/mesh_iface"
-+	[ -n "$mesh_no_rebroadcast" ] && echo "$mesh_no_rebroadcast" > "/sys/class/net/$iface/batman_adv/no_rebroadcast"
-+
- 	proto_init_update "$iface" 1
- 	proto_send_update "$config"
- }
-diff --git a/batman-adv/patches/0001-batman-adv-introduce-no_rebroadcast-option.patch b/batman-adv/patches/0001-batman-adv-introduce-no_rebroadcast-option.patch
-new file mode 100644
-index 0000000..cd79917
---- /dev/null
-+++ b/batman-adv/patches/0001-batman-adv-introduce-no_rebroadcast-option.patch
-@@ -0,0 +1,185 @@
-+From 5ba3f1eac041857deabe39432fdfe1a584bbdd81 Mon Sep 17 00:00:00 2001
-+Message-Id: <5ba3f1eac041857deabe39432fdfe1a584bbdd81.1420645650.git.mschiffer@universe-factory.net>
-+From: =?UTF-8?q?Linus=20L=C3=BCssing?= <linus.luessing@web.de>
-+Date: Tue, 24 Sep 2013 04:36:27 +0200
-+Subject: [PATCH] batman-adv: introduce 'no_rebroadcast' option
-+MIME-Version: 1.0
-+Content-Type: text/plain; charset=UTF-8
-+Content-Transfer-Encoding: 8bit
-+
-+This patch introduces a new sysfs option named "no_rebroadcast" on
-+a per hard interface basis. It allows manually enabling a split-horizon
-+like behaviour for the layer 2 multicast payload frames, in that
-+incoming multicast payload frames on such a hard interface are only
-+being rebroadcasted on all interfaces except the incoming one instead
-+of being rebroadcasted on all interfaces.
-+
-+Such an option should only be enabled if you are certain that these
-+rebroadcasts are unnecessary. This is usually the case for instance
-+for point-to-point wifi longshots or wired links.
-+
-+This option can especially safe a significant amount of upload overhead
-+if the neighbourhood on a link is rather large, for instance in some
-+transitive, symmetric VPN configurations.
-+
-+Using this option wrongly will break your mesh network, use this option
-+wisely and at your own risk!
-+
-+Signed-off-by: Linus Lüssing <linus.luessing@web.de>
-+---
-+ hard-interface.c           |  2 ++
-+ send.c                     |  4 ++++
-+ sysfs-class-net-batman-adv | 10 ++++++++
-+ sysfs.c                    | 59 ++++++++++++++++++++++++++++++++++++++++++++++
-+ types.h                    |  1 +
-+ 5 files changed, 76 insertions(+)
-+
-+diff --git a/hard-interface.c b/hard-interface.c
-+index fbda6b5..3997f9c 100644
-+--- a/hard-interface.c
-++++ b/hard-interface.c
-+@@ -591,6 +591,8 @@ batadv_hardif_add_interface(struct net_device *net_dev)
-+ 	/* extra reference for return */
-+ 	atomic_set(&hard_iface->refcount, 2);
-+ 
-++	atomic_set(&hard_iface->no_rebroadcast, 0);
-++
-+ 	batadv_check_known_mac_addr(hard_iface->net_dev);
-+ 	list_add_tail_rcu(&hard_iface->list, &batadv_hardif_list);
-+ 
-+diff --git a/send.c b/send.c
-+index d27161e..4383a66 100644
-+--- a/send.c
-++++ b/send.c
-+@@ -513,6 +513,10 @@ static void batadv_send_outstanding_bcast_packet(struct work_struct *work)
-+ 		if (forw_packet->num_packets >= hard_iface->num_bcasts)
-+ 			continue;
-+ 
-++		if (atomic_read(&hard_iface->no_rebroadcast) &&
-++		    forw_packet->skb->dev == hard_iface->net_dev)
-++			continue;
-++
-+ 		/* send a copy of the saved skb */
-+ 		skb1 = skb_clone(forw_packet->skb, GFP_ATOMIC);
-+ 		if (skb1)
-+diff --git a/sysfs-class-net-batman-adv b/sysfs-class-net-batman-adv
-+index 7f34a95..cf7fe00 100644
-+--- a/sysfs-class-net-batman-adv
-++++ b/sysfs-class-net-batman-adv
-+@@ -13,3 +13,13 @@ Description:
-+                 displays the batman mesh interface this <iface>
-+                 currently is associated with.
-+ 
-++What:           /sys/class/net/<iface>/batman-adv/no_rebroadcast
-++Date:           Sep 2013
-++Contact:        Linus Lüssing <linus.luessing@web.de>
-++Description:
-++                With this option set incoming multicast payload frames on
-++                <iface> are not being rebroadcasted on <iface> again. This
-++                option should be set on links which are known to be transitive
-++                and symmetric only, for instance point-to-point wifi longshots
-++                or wired links. Using this option wrongly is going to
-++                break your mesh network, use at your own risk!
-+diff --git a/sysfs.c b/sysfs.c
-+index fc47baa..adaeca4 100644
-+--- a/sysfs.c
-++++ b/sysfs.c
-+@@ -110,6 +110,17 @@ struct batadv_attribute batadv_attr_vlan_##_name = {	\
-+ 	.store  = _store,				\
-+ }
-+ 
-++/* Use this, if you have customized show and store functions
-++ * for hard interface attrs
-++ */
-++#define BATADV_ATTR_HIF(_name, _mode, _show, _store)	\
-++struct batadv_attribute batadv_attr_hif_##_name = {	\
-++	.attr = {.name = __stringify(_name),		\
-++		 .mode = _mode },			\
-++	.show   = _show,				\
-++	.store  = _store,				\
-++};
-++
-+ /* Use this, if you have customized show and store functions */
-+ #define BATADV_ATTR(_name, _mode, _show, _store)	\
-+ struct batadv_attribute batadv_attr_##_name = {		\
-+@@ -221,6 +232,52 @@ ssize_t batadv_show_vlan_##_name(struct kobject *kobj,			\
-+ 	static BATADV_ATTR_VLAN(_name, _mode, batadv_show_vlan_##_name,	\
-+ 				batadv_store_vlan_##_name)
-+ 
-++#define BATADV_ATTR_HIF_STORE_BOOL(_name, _post_func)			\
-++ssize_t batadv_store_hif_##_name(struct kobject *kobj,			\
-++				 struct attribute *attr, char *buff,	\
-++				 size_t count)				\
-++{									\
-++	struct net_device *net_dev = batadv_kobj_to_netdev(kobj);	\
-++	struct batadv_hard_iface *hard_iface;				\
-++	size_t res;							\
-++									\
-++	hard_iface = batadv_hardif_get_by_netdev(net_dev);		\
-++	if (!hard_iface)						\
-++		return 0;						\
-++									\
-++	res = __batadv_store_bool_attr(buff, count, _post_func,		\
-++					      attr, &hard_iface->_name,	\
-++					      hard_iface->soft_iface);	\
-++	batadv_hardif_free_ref(hard_iface);				\
-++	return res;							\
-++}
-++
-++#define BATADV_ATTR_HIF_SHOW_BOOL(_name)				\
-++ssize_t batadv_show_hif_##_name(struct kobject *kobj,			\
-++				struct attribute *attr, char *buff)	\
-++{									\
-++	struct net_device *net_dev = batadv_kobj_to_netdev(kobj);	\
-++	struct batadv_hard_iface *hard_iface;				\
-++	size_t res;							\
-++									\
-++	hard_iface = batadv_hardif_get_by_netdev(net_dev);		\
-++	if (!hard_iface)						\
-++		return 0;						\
-++									\
-++	res = sprintf(buff, "%s\n",					\
-++		      atomic_read(&hard_iface->_name) == 0 ?		\
-++				"disabled" : "enabled");		\
-++	batadv_hardif_free_ref(hard_iface);				\
-++	return res;							\
-++}
-++
-++/* Use this, if you are going to turn a [name] in the vlan struct on or off */
-++#define BATADV_ATTR_HIF_BOOL(_name, _mode, _post_func)			\
-++	static BATADV_ATTR_HIF_STORE_BOOL(_name, _post_func)		\
-++	static BATADV_ATTR_HIF_SHOW_BOOL(_name)				\
-++	static BATADV_ATTR_HIF(_name, _mode, batadv_show_hif_##_name,	\
-++			       batadv_store_hif_##_name)
-++
-+ static int batadv_store_bool_attr(char *buff, size_t count,
-+ 				  struct net_device *net_dev,
-+ 				  const char *attr_name, atomic_t *attr)
-+@@ -844,10 +901,12 @@ static ssize_t batadv_show_iface_status(struct kobject *kobj,
-+ static BATADV_ATTR(mesh_iface, S_IRUGO | S_IWUSR, batadv_show_mesh_iface,
-+ 		   batadv_store_mesh_iface);
-+ static BATADV_ATTR(iface_status, S_IRUGO, batadv_show_iface_status, NULL);
-++BATADV_ATTR_HIF_BOOL(no_rebroadcast, S_IRUGO | S_IWUSR, NULL);
-+ 
-+ static struct batadv_attribute *batadv_batman_attrs[] = {
-+ 	&batadv_attr_mesh_iface,
-+ 	&batadv_attr_iface_status,
-++	&batadv_attr_hif_no_rebroadcast,
-+ 	NULL,
-+ };
-+ 
-+diff --git a/types.h b/types.h
-+index 8854c05..39619fb 100644
-+--- a/types.h
-++++ b/types.h
-+@@ -101,6 +101,7 @@ struct batadv_hard_iface {
-+ 	struct batadv_hard_iface_bat_iv bat_iv;
-+ 	struct work_struct cleanup_work;
-+ 	struct dentry *debug_dir;
-++	atomic_t no_rebroadcast;
-+ };
-+ 
-+ /**
-+-- 
-+2.2.1
-+

site

@@ -0,0 +1 @@
+Subproject commit 2c9c1a0f3750e64c6b17c030859db1a549055485

targets/ar71xx-generic/profiles.mk

@@ -12,9 +12,7 @@ $(eval $(call GluonModel,CPE510,cpe210-220-510-520,tp-link-cpe520-v1.0))
 # TL-WA701N/ND v1, v2
 $(eval $(call GluonProfile,TLWA701))
 $(eval $(call GluonModel,TLWA701,tl-wa701n-v1,tp-link-tl-wa701n-nd-v1))
-ifeq ($(BROKEN),1)
-$(eval $(call GluonModel,TLWA701,tl-wa701nd-v2,tp-link-tl-wa701n-nd-v2)) # BROKEN: untested
-endif
+$(eval $(call GluonModel,TLWA701,tl-wa701nd-v2,tp-link-tl-wa701n-nd-v2))
 
 # TL-WR703N v1
 $(eval $(call GluonProfile,TLWR703))
@@ -24,25 +22,28 @@ $(eval $(call GluonModel,TLWR703,tl-wr703n-v1,tp-link-tl-wr703n-v1))
 $(eval $(call GluonProfile,TLWR710))
 $(eval $(call GluonModel,TLWR710,tl-wr710n-v1,tp-link-tl-wr710n-v1))
 
-# TL-WR740N v1, v3, v4
+# TL-WR740N v1, v3, v4, v5
 $(eval $(call GluonProfile,TLWR740))
 $(eval $(call GluonModel,TLWR740,tl-wr740n-v1,tp-link-tl-wr740n-nd-v1))
 $(eval $(call GluonModel,TLWR740,tl-wr740n-v3,tp-link-tl-wr740n-nd-v3))
 $(eval $(call GluonModel,TLWR740,tl-wr740n-v4,tp-link-tl-wr740n-nd-v4))
+$(eval $(call GluonModel,TLWR740,tl-wr740n-v5,tp-link-tl-wr740n-nd-v5))
 
-# TL-WR741N/ND v1, v2, v4
+# TL-WR741N/ND v1, v2, v4, v5
 $(eval $(call GluonProfile,TLWR741))
 $(eval $(call GluonModel,TLWR741,tl-wr741nd-v1,tp-link-tl-wr741n-nd-v1))
 $(eval $(call GluonModel,TLWR741,tl-wr741nd-v2,tp-link-tl-wr741n-nd-v2))
 $(eval $(call GluonModel,TLWR741,tl-wr741nd-v4,tp-link-tl-wr741n-nd-v4))
+$(eval $(call GluonModel,TLWR741,tl-wr741nd-v5,tp-link-tl-wr741n-nd-v5))
 
 # TL-WR743N/ND v1, v1.1, v2
 $(eval $(call GluonProfile,TLWR743))
 $(eval $(call GluonModel,TLWR743,tl-wr743nd-v1,tp-link-tl-wr743n-nd-v1))
 $(eval $(call GluonModel,TLWR743,tl-wr743nd-v2,tp-link-tl-wr743n-nd-v2))
 
-# TL-WR801N/ND v2
+# TL-WR801N/ND v1, v2
 $(eval $(call GluonProfile,TLWA801))
+$(eval $(call GluonModel,TLWA801,tl-wa801nd-v1,tp-link-tl-wa801n-nd-v1))
 $(eval $(call GluonModel,TLWA801,tl-wa801nd-v2,tp-link-tl-wa801n-nd-v2))
 
 # TL-WR841N/ND v3, v5, v7, v8, v9
@@ -83,11 +84,10 @@ $(eval $(call GluonModel,TLWDR4300,tl-wdr4300-v1,tp-link-tl-wdr4300-v1))
 $(eval $(call GluonProfile,TLWA750))
 $(eval $(call GluonModel,TLWA750,tl-wa750re-v1,tp-link-tl-wa750re-v1))
 
-ifeq ($(BROKEN),1)
-# TL-WA830RE v2
+# TL-WA830RE v1, v2
 $(eval $(call GluonProfile,TLWA830))
+$(eval $(call GluonModel,TLWA830,tl-wa830re-v1,tp-link-tl-wa830re-v1))
 $(eval $(call GluonModel,TLWA830,tl-wa830re-v2,tp-link-tl-wa830re-v2))
-endif
 
 # TL-WA850RE v1
 $(eval $(call GluonProfile,TLWA850))
@@ -135,6 +135,10 @@ endif
 ## Ubiquiti (everything)
 $(eval $(call GluonProfile,UBNT))
 $(eval $(call GluonModel,UBNT,ubnt-bullet-m,ubiquiti-bullet-m))
+$(eval $(call GluonModel,UBNT,ubnt-bullet-m,ubiquiti-loco-m))
+$(eval $(call GluonModel,UBNT,ubnt-bullet-m,ubiquiti-picostation-m))
+$(eval $(call GluonModel,UBNT,ubnt-bullet-m,ubiquiti-rocket-m))
+
 $(eval $(call GluonModel,UBNT,ubnt-loco-m-xw,ubiquiti-loco-m-xw))
 $(eval $(call GluonModel,UBNT,ubnt-nano-m,ubiquiti-nanostation-m))
 $(eval $(call GluonModel,UBNT,ubnt-nano-m-xw,ubiquiti-nanostation-m-xw))

targets/x86-generic/profiles.mk

@@ -1,4 +1,4 @@
-X86_GENERIC_NETWORK_MODULES := kmod-3c59x kmod-e100 kmod-e1000 kmod-natsemi kmod-ne2k-pci kmod-pcnet32 kmod-8139too kmod-r8169 kmod-sis900 kmod-tg3 kmod-via-rhine kmod-via-velocity
+X86_GENERIC_NETWORK_MODULES := kmod-3c59x kmod-e100 kmod-e1000 kmod-e1000e kmod-natsemi kmod-ne2k-pci kmod-pcnet32 kmod-8139too kmod-r8169 kmod-sis900 kmod-tg3 kmod-via-rhine kmod-via-velocity
 
 
 $(eval $(call GluonProfile,GENERIC,$(X86_GENERIC_NETWORK_MODULES)))