Merge remote-tracking branch 'origin/3.6'

icwmp/Makefile

@@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=3.0-2016-06-16
+PKG_VERSION:=3.0-2016-07-07
 PKG_FIXUP:=autoreconf
 PKG_SOURCE_URL:=http://public.inteno.se:/icwmp.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=fa9b081fd983914faabd673967c3b30c39c56554
+PKG_SOURCE_VERSION:=6fac1df3418d727388162d5e006c7a756c9ff8d2
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
@@ -68,7 +68,7 @@ endif
 
 TARGET_CFLAGS += \
 	-D_GNU_SOURCE -D_AADJ
-	
+
 ifneq ($(CWMP_REVISION)_,_)
 ifneq ($(CWMP_REVISION),exported)
 ifneq ($(CWMP_REVISION),Unversioned directory)

iop/configs/config

@@ -105,6 +105,7 @@ CONFIG_PACKAGE_mtd-utils-ubiupdatevol=y
 CONFIG_PACKAGE_multiwan=y
 CONFIG_PACKAGE_ndisc6=y
 CONFIG_PACKAGE_netcheck=y
+CONFIG_PACKAGE_ntfs-3g=y
 CONFIG_PACKAGE_odhcp6c=y
 CONFIG_PACKAGE_odhcpd=y
 CONFIG_PACKAGE_openssl-util=y

layer2interface/broadcom/etc/init.d/layer2_interface_adsl

@@ -101,7 +101,8 @@ atm_inf_conf() {
 		ret="$?"
 		xtmctl operate conn --add 1.$vpi.$vci aal5 $encaps 0 1 $ret
 		xtmctl operate conn --addq 1.$vpi.$vci 0 wrr 1 # low  priority queue
-		xtmctl operate conn --addq 1.$vpi.$vci 7 wrr 1 # high priority queue
+		xtmctl operate conn --addq 1.$vpi.$vci 1 wrr 1 # mid  priority queue upstream ACK's and ping from LAN will use this queue
+		xtmctl operate conn --addq 1.$vpi.$vci 7 wrr 1 # high priority queue, internal traffic dhcp igmp dns and icmp
 		xtmctl operate conn --createnetdev 1.$vpi.$vci ${ifname%%.*}
 		xtmctl operate intf --state 1 enable
 		

questd/Makefile

@@ -8,7 +8,7 @@ include $(INCLUDE_DIR)/kernel.mk
 PKG_NAME:=questd
 PKG_VERSION:=3.1.6
 
-PKG_SOURCE_VERSION:=ea462d795bf25a4837968fd77bfeda1b44c2f2c7
+PKG_SOURCE_VERSION:=2b2f6928fde8ce9f7ab41957418104487b5b8c33
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=http://public.inteno.se:/questd