layer2interface: stop vlan when layer2 ethernet stop is called

-------------------------------------------------------------------------------
* b279429 fix empty client list on wl1 when wl0 is disabled ref #13485
* 1c47a44 change strndup to strdup to avoid warnings
-------------------------------------------------------------------------------
commit b2794295fdf9469b6cd8ba1544f291d4b83a7d5a
Author: Reidar Cederqvist <reidar.cederqvist@gmail.com>
Date: 2017-12-15 11:33:13 +0100

    fix empty client list on wl1 when wl0 is disabled ref #13485

Base directory -> /
 network.c |  5 +++--
 port.c    | 17 +++++++++++++++++
 port.h    |  1 +
 3 files changed, 21 insertions(+), 2 deletions(-)
-------------------------------------------------------------------------------
commit 1c47a44bfcb863319282900446bf20965c9eccbc
Author: Reidar Cederqvist <reidar.cederqvist@gmail.com>
Date: 2017-12-15 11:24:01 +0100

    change strndup to strdup to avoid warnings

Base directory -> /
 port.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
-------------------------------------------------------------------------------

ice-client/Makefile

@@ -19,14 +19,14 @@ export PLATFORM_INCLUDE:=platforms/iopsys/build.mk
 
 export DATE:=$(shell date +%Y-%m-%d-%H-%M-%S)
 export LOGIN:=$(shell whoami)
-BASE_PKG_VERSION:=5.0.0
-PKG_RELEASE:=RC8
+BASE_PKG_VERSION:=5.0.2
+PKG_RELEASE:=RC4
 PKG_VERSION:=$(BASE_PKG_VERSION)-$(PKG_RELEASE)_$(DATE)_$(LOGIN)
 export PKG_VERSION
 
 ###########################--RELEASE--################################
 
-PKG_SOURCE_VERSION:=57b19721eb8906cb0c5e34a28eba080bc5b74a26
+PKG_SOURCE_VERSION:=d7102770d9a7bbd5e926a02391e221d947353544
 ifeq ($(CONFIG_ICE_OPEN),y)
 TARGET_PROFILE=$(shell echo $(CONFIG_TARGET_BOARD) | sed s/\"//g)
 PKG_SOURCE_URL:=http://iopsys.inteno.se/iopsys/consumer/

iop/scripts/genconfig.sh

@@ -15,7 +15,7 @@ function genconfig {
 	LOCAL_MIRROR="http://mirror.inteno.se/mirror"
 
 	iopsys_brcm63xx_mips="cg300 cg301 dg150 dg150v2 dg150alv2 dg200 dg200al dg301 dg301al eg300 vg50 vox25 hpc_hu02"
-	iopsys_brcm63xx_arm="dg400 eg400 f104w f104 dg400prime dg400primeb 963138REF_P502"
+	iopsys_brcm63xx_arm="dg400 eg400 sdx_500rg f104w f104 dg400prime dg400primeb 963138REF_P502"
 	iopsys_ramips="ex400"
 	ramips="mt7621"
 	target="bogus"

layer2interface/broadcom/etc/init.d/layer2_interface_ethernet

@@ -55,7 +55,6 @@ addethernet() {
 	ifname="${ifname:-$baseifname.1}"
 
 	brcm_virtual_interface_rules "$baseifname" "$ifname" "$bridge" "$mac2"
-
 }
 
 boot() {
@@ -96,12 +95,15 @@ start_service() {
 	echo "Setting up Ethernet WAN"
 	config_load layer2_interface_ethernet
 	config_foreach addethernet ethernet_interface
+	/etc/init.d/layer2_interface_vlan start
 }
 
 stop_service() {
 	local ifname
 	config_load layer2_interface_ethernet
 	config_foreach removeethernet ethernet_interface
+	/etc/init.d/layer2_interface_vlan stop
+	sleep 1
 }
 
 reload_service() {
@@ -113,4 +115,3 @@ service_triggers() {
 	procd_add_reload_trigger layer2_interface_ethernet
 }
 
-

questd/Makefile

@@ -6,9 +6,9 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=questd
-PKG_VERSION:=3.1.39
+PKG_VERSION:=3.1.40
 
-PKG_SOURCE_VERSION:=10cba850fb80668502ca5ce0bc57533089062741
+PKG_SOURCE_VERSION:=6eab946ae888246bb735e1ef8f5005bf112eca50
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=http://public.inteno.se:/questd
 

questd/files/sbin/imonitor

@@ -23,7 +23,7 @@ NPROC_COUNT=4	# number of time that the NPROC_LIMIT has to be hit to trigger a p
 NPROC_NFAIL=0	# current consecutive Number of FAILures. process restarts when NPROC_NFAIL == NPROC_COUNT
 
 # memmory limit
-MEM_LIMIT=15000
+MEM_LIMIT=20000
 MEM_COUNT=4
 MEM_NFAIL=0
 
@@ -41,6 +41,11 @@ UBUS_TIMEOUT=5
 BSDBIN=$(which bsd)
 ACSDBIN=$(which acsd)
 
+RESTART_ACSD=0
+RESTART_BSD=0
+
+DUALBAND=1
+
 restart_questd()
 {
 	logger -s -t $0[$$] "Restarting questd. $NPROC_NFAIL $MEM_NFAIL $PCPU_NFAIL $NNET_NFAIL"
@@ -129,6 +134,8 @@ check_ubus_network_call() {
 	json_load "$(ifstatus lan)" || return 0
 	json_get_var up up
 	[ $up -eq 1 ] || return 0
+	local ifname="$(uci -q get network.lan.ifname)"
+	[ -z "$ifname" -o "${ifname:0:3}" == "br-" ] && return 0
 	ubus -t 5 call router.network ports '{"network":"lan"}' | grep -q statistics || {
 		NNET_NFAIL=1
 		return 1
@@ -138,9 +145,27 @@ check_ubus_network_call() {
 
 restart_bsd()
 {
-	logger -s -t $0[$$] "Restarting bsd."
-	killall -q -KILL bsd
-	bsd
+	killall -q -15 bsd 2>/dev/null
+
+	[ "$(nvram get wl0_radio)" == "1" -a "$(nvram get wl1_radio)" == "1" ] || {
+		[ $DUALBAND -eq 1 ] && logger -s -t $0[$$] "Band Steering is deactivated; will be re-activated when both 2.4GHz and 5GHz radios are enabled."
+		DUALBAND=0
+		return 0
+	} && DUALBAND=1
+
+	logger -s -t $0[$$] "Restarting Band Steering daemon due to bsd hangup."
+
+	if [ $RESTART_BSD -eq 3 ]; then
+		wlctl -i wl0 down 2>/dev/null
+		wlctl -i wl1 down 2>/dev/null
+		wlctl -i wl0 up 2>/dev/null
+		wlctl -i wl1 up 2>/dev/null
+		RESTART_ACSD=0
+		RESTART_BSD=0
+	else
+		RESTART_BSD=$((RESTART_BSD+1))
+	fi
+	bsd &
 }
 
 check_bsdcall()
@@ -157,9 +182,19 @@ check_bsdcall()
 
 restart_acsd()
 {
-	logger -s -t $0[$$] "Restarting acsd."
-	killall -q -KILL acsd
-	acsd &
+	logger -s -t $0[$$] "Restarting Auto Channel Selection daemon due to acsd high CPU usage."
+	killall -q -9 acsd 2>/dev/null
+	if [ $RESTART_ACSD -eq 3 ]; then
+		wlctl -i wl0 down 2>/dev/null
+		wlctl -i wl1 down 2>/dev/null
+		wlctl -i wl0 up 2>/dev/null
+		wlctl -i wl1 up 2>/dev/null
+		RESTART_ACSD=0
+		RESTART_BSD=0
+	else
+		RESTART_ACSD=$((RESTART_ACSD+1))
+	fi
+	acsd
 }
 
 check_acsd()
@@ -171,7 +206,7 @@ check_acsd()
 
 	for p in $pcpu; do
 		p=${p%%%*}
-		if [ "$p" -ge "20" ]; then
+		if [ "$p" -ge "40" ]; then
 			return 1
 		fi
 	done
@@ -217,8 +252,7 @@ main()
 		fi
 
 		if [ "$BSDBIN" ] ; then
-			config_load wireless
-			config_get_bool bsdenabled bandsteering enabled 0
+			bsdenabled="$(uci -q get wireless.bandsteering.enabled)"
 			if [ $bsdenabled == "1" -a "$(pidof wifi)" == "" ] ; then
 				check_bsdcall || restart_bsd
 			fi

tptest/files/etc/config/speedtest

@@ -1,8 +1,5 @@
-config testserver '1'
-	option server 'tptest.bredband.net'
-	option port '1640'
 
-config testserver '2'
+config testserver '1'
 	option server 'referens.sth.ip-performance.se'
 	option port '1642'
 

voice-client/Makefile

@@ -16,7 +16,7 @@ define Package/voice-client
   SECTION:=net
   CATEGORY:=Network
   TITLE:=voice-client
-  DEPENDS:=+asterisk18-mod
+#  DEPENDS:=@(asterisk13||asterisk18-mod)
 endef
 
 define Package/voice-client/description