layer2interface: stop vlan when layer2 ethernet stop is called

catv/files/etc/config/catv

@@ -1,4 +1,4 @@
 
 config service 'catv'
-        option enable '0'
+        option enable 'no'
         option filter '3'

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.1
-PKG_RELEASE:=RC1
+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:=a2635dd11c477d70728ab6cbe5c2dee3965dbe14
+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/

ifbt/Makefile

@@ -1,36 +0,0 @@
-#
-# Copyright (C) 2013 Inteno
-#
-
-include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/kernel.mk
-
-PKG_NAME:=ifbt
-PKG_VERSION:=0.1
-
-PKG_SOURCE_VERSION:=da97d6668d3c0e3f2be226c66b406e90179ada81
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=git@private.inteno.se:ifbt.git
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/ifbt
-	CATEGORY:=Utilities
-	DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c
-	TITLE:=Fast BSS Transition
-endef
-
-define Package/ifbt/description
-	ifbt is Iopsys application for fast BSS transition
-endef
-
-define Package/ifbt/install
-	$(INSTALL_DIR) $(1)/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ifbt $(1)/sbin/
-endef
-
-$(eval $(call BuildPackage,ifbt))

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

@@ -8,7 +8,7 @@ include $(INCLUDE_DIR)/kernel.mk
 PKG_NAME:=questd
 PKG_VERSION:=3.1.40
 
-PKG_SOURCE_VERSION:=b2794295fdf9469b6cd8ba1544f291d4b83a7d5a
+PKG_SOURCE_VERSION:=6eab946ae888246bb735e1ef8f5005bf112eca50
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=http://public.inteno.se:/questd
 

questd/files/sbin/imonitor

@@ -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"
@@ -140,12 +145,26 @@ check_ubus_network_call() {
 
 restart_bsd()
 {
-	logger -s -t $0[$$] "Restarting WiFi and Band Steering daemon due to bsd hangup."
 	killall -q -15 bsd 2>/dev/null
-	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
+
+	[ "$(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 &
 }
 
@@ -163,12 +182,18 @@ check_bsdcall()
 
 restart_acsd()
 {
-	logger -s -t $0[$$] "Restarting WiFi and Auto Channel Selection daemon due to acsd high CPU usage."
+	logger -s -t $0[$$] "Restarting Auto Channel Selection daemon due to acsd high CPU usage."
 	killall -q -9 acsd 2>/dev/null
-	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
+	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
 }
 
@@ -227,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

voice-client/Makefile

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