qos : Classification with tc+iptables for QoS on MTK_PANTHER

Description : For the tc classification, qos_postrouting
scheme has been chosen as the target in iptables.
This change set contains code changes for iptables
programming via qos.sh script modification for upstream
traffic classification on WAN port.

bbf/Makefile

@@ -5,11 +5,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libbbfdm
-PKG_VERSION:=6.8.17
+PKG_VERSION:=6.8.16
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/bbf.git
-PKG_SOURCE_VERSION:=9f01ada03501c8db07f8eeff695b44b47309f11c
+PKG_SOURCE_VERSION:=0ef6169d86333b8727ed34c63f379b08254340e3
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 

dectmngr/Makefile

@@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dectmngr
 PKG_RELEASE:=3
-PKG_VERSION:=3.5.6
+PKG_VERSION:=3.5.5
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/dectmngr.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=81450033d98fcdb68911e2148f48d190492090a6
+PKG_SOURCE_VERSION:=cf4e91ffe0a1d83140fef5b41d16e581e5341cec
 PKG_MIRROR_HASH:=skip
 endif
 

dslmngr/Makefile

@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dslmngr
-PKG_VERSION:=1.2.0
+PKG_VERSION:=1.1.2
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
@@ -68,10 +68,6 @@ define Build/Compile
 endef
 
 define Package/dslmngr/install
-	$(CP) ./files/common/* $(1)/
-ifeq ($(CONFIG_TARGET_brcmbca),y)
-	$(CP) ./files/broadcom/* $(1)/
-endif
 	$(INSTALL_DIR) $(1)/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/dslmngr $(1)/sbin/
 endef

dslmngr/files/broadcom/lib/dsl/broadcom.sh

@@ -1,311 +0,0 @@
-#!/bin/sh
-
-. /lib/functions.sh
-
-# ATM #
-check_pvc() {
-	local vpi=$1
-	local vci=$2
-	local ret
-
-	ret=$(xtmctl operate conn --show | awk -v test="$vpi/$vci" '{if ($3==test ) print $5 }')
-
-	case $ret in
-		''|*[!0-9]*) return 0 ;;
-		*) return $ret ;;
-	esac
-}
-
-check_xtm_list() {
-	local qclass=$1
-	local pcr scr mbs
-	local ret
-
-	case $# in
-		1)
-			pcr=0
-			scr=0
-			mbs=0
-		;;
-		2)
-			pcr=$2
-			scr=0
-			mbs=0
-		;;
-		4)
-			pcr=$2
-			scr=$3
-			mbs=$4
-		;;
-	esac
-
-	ret=$(xtmctl operate tdte --show | awk -v test="$qclass" -v pcr="$pcr" -v scr="$scr" -v mbs="$mbs" '{if ($2==test && $3==pcr && $4==scr && $5==mbs ) print $1 }')
-
-	case $ret in
-		''|*[!0-9]*) return 0 ;;
-		*) return $ret ;;
-	esac
-}
-
-configure_atm_device() {
-	local name vpi vci device link_type encapsulation qos_class pcr mbs scr i
-
-	config_get name $1 name "ATM"
-	config_get vpi $1 vpi "8"
-	config_get vci $1 vci "35"
-	config_get device $1 device "atm0"
-	config_get link_type $1 link_type "eoa"
-	config_get encapsulation $1 encapsulation "llc"
-	config_get qos_class $1 qos_class "ubr"
-	config_get pcr $1 pcr
-	config_get mbs $1 mbs
-	config_get scr $1 scr
-
-	check_pvc $vpi $vci
-	ret=$?
-
-	if [ "$ret" -eq 0 ]; then
-		check_xtm_list $qos_class $pcr $scr $mbs
-		ret=$?
-
-		if [ "$ret" -eq 0 ]; then
-			case $qos_class in # ubr, cbr, gfr, vbr-nrt, vbr-rt, ubr+, abr
-				ubr)
-					xtmctl operate tdte --add "$qos_class"
-				;;
-				ubr_pcr|ubr+)
-					xtmctl operate tdte --add "$qos_class" $pcr
-				;;
-				cbr)
-					xtmctl operate tdte --add "$qos_class" $pcr
-				;;
-				nrtvbr|vbr-nrt)
-					xtmctl operate tdte --add "$qos_class" $pcr $scr $mbs
-				;;
-				rtvbr|vbr-rt)
-					xtmctl operate tdte --add "$qos_class" $pcr $scr $mbs
-				;;
-				gfr)
-				;;
-				abr)
-				;;
-			esac
-		fi
-
-		case $link_type in # EoA, IPoA, PPPoA, CIP
-			EoA|eoa)
-				[ $encapsulation == "vcmux" ] && encapsulation="vcmux_eth" || encapsulation="llcsnap_eth"
-			;;
-			PPPoA|pppoa)
-				[ $encapsulation == "vcmux" ] && encapsulation="vcmux_pppoa" || encapsulation="llcencaps_ppp"
-			;;
-			IPoA|ipoa)
-				[ $encapsulation == "vcmux" ] && encapsulation="vcmux_ipoa" || encapsulation="llcsnap_rtip"
-			;;
-			CIP|cip)
-			;;
-		esac
-
-		check_xtm_list $qos_class $pcr $scr $mbs
-		ret="$?"
-
-		xtmctl operate conn --add 1.$vpi.$vci aal5 $encapsulation 0 1 $ret
-		for i in `seq 0 7`; do
-			xtmctl operate conn --addq 1.$vpi.$vci $i wrr 1 dt # queue priority 0-7
-		done
-		xtmctl operate conn --createnetdev 1.$vpi.$vci $device
-		xtmctl operate intf --state 1 enable
-	fi
-}
-
-remove_atm_devices() {
-	local vpi vci rest
-	local vpivci=`xtmctl operate conn --show | grep "ATM\|mode" | awk '{if (NR!=1 && $1!="PTM") {print $3}}'`
-
-	for i in $vpivci
-	do
-		rest=${i#\/}
-		vpi=${rest%%\/*}
-		vci=${rest#*\/}
-		echo "xtmctl operate conn --delete 1.$vpi.$vci"
-		xtmctl operate conn --delete 1.$vpi.$vci
-		echo "xtmctl operate conn --deletenetdev 1.$vpi.$vci"
-		xtmctl operate conn --deletenetdev 1.$vpi.$vci
-	done
-}
-
-create_atm_devices() {
-	echo "Creating ATM Device(s)"
-	config_load dsl
-	config_foreach configure_atm_device atm-device
-}
-# ATM END #
-
-# PTM #
-check_ptm() {
-	local ret
-	local ptmprio=$1
-	local dslat=$2
-
-	if [ "$ptmprio" -eq 2 ]; then
-		ptmprio="high"
-	else
-		ptmprio="low"
-	fi
-
-	ret=$(xtmctl operate conn --show | awk -v dslat="$dslat" -v ptmprio="$ptmprio" '{if ($2 == dslat && $3 == ptmprio ) print $2 }')
-
-	case $ret in
-		''|*[!0-9]*) return 0 ;;
-		*) return $ret ;;
-	esac
-}
-
-configure_ptm_device() {
-	local name device priority portid i
-
-	config_get name $1 name "PTM"
-	config_get device $1 device "ptm0"
-	config_get priority $1 priority 1
-	config_get portid $1 portid 1
-
-	check_ptm $priority $portid
-	ret=$?
-
-	if [ "$ret" -eq 0 ]; then
-		xtmctl operate conn --add $portid.$priority
-
-		for i in `seq 0 7`; do
-			xtmctl operate conn --addq $portid.$priority $i wrr 1 dt -1 -1 3000 # queue priority 0-7
-		done
-		echo "xtmctl operate conn --createnetdev $portid.$priority $device"
-		xtmctl operate conn --createnetdev $portid.$priority $device
-		xtmctl operate intf --state 1 enable
-	fi
-}
-
-remove_ptm_devices() {
-	local delptm
-	local x=0
-
-	IFS=$'\n'
-	for i in `xtmctl operate conn --show | grep "PTM\|mode"`
-	do
-		if [ $x -eq 1 ]; then
-			delptm=$(echo $i | awk '{if ($1!="ATM") print $2"."$11}')
-			echo "xtmctl operate conn --delete $delptm"
-			xtmctl operate conn --delete $delptm
-			xtmctl operate conn --deletenetdev $delptm
-		fi
-		x=1
-	done
-	unset IFS
-}
-
-create_ptm_devices() {
-	echo "Creating PTM Device(s)"
-	config_load dsl
-	config_foreach configure_ptm_device ptm-device
-}
-# PTM END #
-
-prioritize_arp()
-{
-      ebtables -t nat -D POSTROUTING -j mark --mark-or 0x7 -p ARP >/dev/null
-      ebtables -t nat -A POSTROUTING -j mark --mark-or 0x7 -p ARP >/dev/null
-}
-
-xtm_remove_devices() {
-	remove_atm_devices
-	remove_ptm_devices
-}
-
-xtm_create_devices() {
-	local tpstc="$(xdslctl info --show | grep TPS-TC)"
-	if echo "$tpstc" | grep -q "ATM Mode"; then
-		create_atm_devices
-	elif echo "$tpstc" | grep -q "PTM Mode"; then
-		create_ptm_devices
-	fi
-}
-
-xdsl_configure() {
-	local VDSL=0
-	local GFAST=0
-	local mod=""
-	local modes=""
-	local profile=""
-
-	config_load dsl
-
-	# Modes
-	config_get mode line mode
-	for mod in $mode; do
-		[ $mod == "gdmt" ] && modes="${modes}d"
-		[ $mod == "glite" ] && modes="${modes}l"
-		[ $mod == "t1413" ] && modes="${modes}t"
-		[ $mod == "adsl2" ] && modes="${modes}2"
-		[ $mod == "adsl2p" ] && modes="${modes}p"
-		[ $mod == "annexl" ] && modes="${modes}e"
-		[ $mod == "annexm" ] && modes="${modes}m"
-		[ $mod == "vdsl2" ] && modes="${modes}v" && VDSL=1
-		[ $mod == "gfast" ] && modes="${modes}f" && GFAST=1
-	done
-
-	# VDSL Profiles
-	config_get profile line profile
-	# Capabilities
-	config_get_bool bitswap line bitswap 1
-	[ $bitswap -eq 1 ] && bitswap="on" || bitswap="off"
-	config_get_bool sra line sra 1
-	[ $sra -eq 1 ] && sra="on" || sra="off"
-#	config_get_bool trellis line trellis 1
-	config_get_bool sesdrop line sesdrop 0
-	[ $sesdrop -eq 1 ] && sesdrop="on" || sesdrop="off"
-	# VDSL2 only
-	config_get_bool us0 line us0 1
-	[ $us0 -eq 1 ] && us0="on" || us0="off"
-#	config_get_bool dynamicd line dynamicd 1
-#	config_get_bool dynamicf line dynamicf 1
-	config_get_bool sos line sos 0
-	[ $sos -eq 1 ] && sos="on" || sos="off"
-
-	config_get_bool phyReXmtUs line phyReXmtUs 0
-	config_get_bool phyReXmtDs line phyReXmtDs 1
-	phyReXmt=$(( $((phyReXmtUs<<1)) + phyReXmtDs))
-
-	if [ $VDSL -eq 1 -o $GFAST -eq 1 ]; then
-		echo "xdslctl start --up --mod $modes --profile "$profile" --sra $sra --bitswap $bitswap --us0 $us0 --sesdrop $sesdrop --SOS $sos --phyReXmt $phyReXmt"
-		xdslctl start --up --mod $modes --profile "$profile" --sra $sra --bitswap $bitswap --us0 $us0 --sesdrop $sesdrop --SOS $sos --phyReXmt $phyReXmt
-		# G.Fast hardware to VDSL hardware, to set the driver bit kPhyCfg2EnableGfastVdslMMTimeOut0.
-		# Enable V43 tone for GFAST.
-		echo "xdslctl configure1 --phycfg 0 0 0 0 0 0 0 0 0 0 0 0x1400400 0x1400400"
-		xdslctl configure1 --phycfg 0 0 0 0 0 0 0 0 0 0 0 0x1400400 0x1400400
-	else
-		echo "xdslctl start --up --mod $modes --sra $sra --bitswap $bitswap --sesdrop $sesdrop --SOS $sos --phyReXmt $phyReXmt"
-		xdslctl start --up --mod $modes --sra $sra --bitswap $bitswap --sesdrop $sesdrop --SOS $sos --phyReXmt $phyReXmt
-	fi
-
-	if [ $GFAST -eq 1 ]; then
-		# G.Fast hardware to VDSL hardware, to set the driver bit kPhyCfg2EnableGfastVdslMMTimeOut0.
-		# Enable V43 tone for GFAST.
-		echo "xdslctl configure1 --phycfg 0 0 0 0 0 0 0 0 0 0 0 0x1400400 0x1400400"
-		xdslctl configure1 --phycfg 0 0 0 0 0 0 0 0 0 0 0 0x1400400 0x1400400
-	fi
-}
-
-xdsl_stop() {
-	# echo "Stopping DSL"
-	# stop causes IRQ issues
-	# xdslctl stop
-	return 0
-}
-
-xdsl_init() {
-	prioritize_arp
-
-	echo "Starting DSL"
-
-	xtmctl start
-	xtmctl operate intf --state 1 enable
-}

dslmngr/files/common/etc/config/dsl

@@ -1,53 +0,0 @@
-# OEM specific parameters
-config oem-parameters 'oem'
-#	option country_code "0000"   # 2 bytes hex
-#	option vendor_id "IO"        # 4 bytes string
-#	option vendor_suffix "0000"  # 2 bytes hex
-#	option sw_version "iopsys"   # 16 bytes string
-#	option serial_nr "00000000"  # 32 bytes string
-
-# DSL Modes
-config dsl-line line
-	list mode gdmt
-	list mode glite
-	list mode t1413
-	list mode adsl2
-	list mode adsl2p
-	list mode annexl
-	list mode annexm
-	list mode vdsl2
-	# VDSL2 profiles
-	list profile 8a
-	list profile 8b
-	list profile 8c
-	list profile 8d
-	list profile 12a
-	list profile 12b
-	list profile 17a
-	list profile 30a
-	option bitswap 1
-	option sra 1
-	option us0 1 # VDSL2 only
-	option sesdrop 0
-	option sos 0
-	option phyReXmtUs 0
-	option phyReXmtDs 1
-
-config atm-device atm0
-	option name 'ATM'
-	option vpi '8'
-	option vci '35'
-	option device atm0
-	option link_type 'eoa' # EoA, IPoA, PPPoA, CIP
-	option encapsulation 'llc' # llc, vcmux
-	option qos_class 'ubr' # ubr, cbr, gfr, vbr-nrt, vbr-rt, ubr+, abr
-#	option pcr '512'
-#	option scr '256'
-#	option mbs '1024'
-
-config ptm-device ptm0
-	option name 'PTM'
-	option device 'ptm0'
-	option priority '1'
-	option portid '1'
-

dslmngr/files/common/etc/hotplug.d/dsl/10-devices

@@ -1,7 +0,0 @@
-[ "$STATUS" == "up" -o "$STATUS" == "down" ] || exit 0
-
-. /lib/functions.sh
-include /lib/dsl
-
-xtm_remove_devices
-xtm_create_devices

dslmngr/files/common/etc/hotplug.d/dsl/20-leds

@@ -1,7 +0,0 @@
-if [ "$STATUS" == "up" ]; then
-	ubus call led.dsl set '{"state":"ok"}'
-elif [ "$STATUS" == "down" ]; then
-	ubus call led.dsl set '{"state":"off"}'
-elif [ "$STATUS" == "training" ]; then
-	ubus call led.dsl set '{"state":"alert"}'
-fi

dslmngr/files/common/etc/init.d/dsl

@@ -1,48 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-. /lib/functions.sh
-include /lib/dsl
-
-START=20
-USE_PROCD=1
-
-DSLMNGR=$(which dslmngr)
-
-start_service() {
-	[ -n "$DSLMNGR" ] && {
-		procd_open_instance
-		procd_set_param command "$DSLMNGR"
-		procd_set_param respawn
-		procd_close_instance
-	}
-
-	xdsl_configure
-	xtm_create_devices
-}
-
-stop_service() {
-	[ -n "$DSLMNGR" ] && service_stop $DSLMNGR
-
-	xtm_remove_devices
-	xdsl_stop
-}
-
-boot() {
-	local HASADSL="$(db -q get hw.board.hasAdsl)"
-	local HASVDSL="$(db -q get hw.board.hasVdsl)"
-	[ "$HASADSL" == "1" -o "$HASVDSL" == "1" ] || return
-
-	xdsl_init
-
-	start
-}
-
-reload_service() {
-	stop
-	start
-}
-
-service_triggers() {
-        procd_add_reload_trigger dsl
-}
-

easy-soc-libs/Makefile

@@ -7,13 +7,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=easy-soc-libs
-PKG_VERSION:=7.2.4
+PKG_VERSION:=6.8.0
 PKG_RELEASE:=1
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=740b6e4f2c51ecc1efa496170fe1e98caa06fd7b
+PKG_SOURCE_VERSION:=ddc7b272bec5e3b5c2a216a1f86cd5589a1a4a19
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/easy-soc-libs.git
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
@@ -59,10 +59,6 @@ else ifeq ($(CONFIG_TARGET_airoha),y)
   TARGET_PLATFORM=ECONET
   TARGET_WIFI_TYPE=MAC80211
   TARGET_CFLAGS +=-DIOPSYS_ECONET
-else ifeq ($(CONFIG_TARGET_ipq95xx),y)
-  TARGET_PLATFORM=IPQ95XX
-  TARGET_WIFI_TYPE=MAC80211
-  TARGET_CFLAGS +=-DIPQ95XX
 else
   $(info Unexpected CONFIG_TARGET, use default MAC80211)
   TARGET_PLATFORM=MAC80211

easy-soc-libs/wifi.mk

@@ -18,9 +18,6 @@ endef
 define Build/InstallDev/libwifi
 	$(INSTALL_DIR) $(1)/usr/include
 	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libwifi/wifidefs.h $(1)/usr/include/
-	$(CP) $(PKG_BUILD_DIR)/libwifi/wifiutils.h $(1)/usr/include/
-	$(CP) $(PKG_BUILD_DIR)/libwifi/wifiops.h $(1)/usr/include/
 	$(CP) $(PKG_BUILD_DIR)/libwifi/wifi.h $(1)/usr/include/
 	$(CP) $(PKG_BUILD_DIR)/libwifi/libwifi*.so* $(1)/usr/lib/
 endef

endptmngr/Makefile

@@ -13,7 +13,7 @@ LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/endptmngr.git
-PKG_SOURCE_VERSION:=fb85081443c19b5062bede49c80b1802c0f05d34
+PKG_SOURCE_VERSION:=dc12712af8c4088f7873502ca845e51c68a1ada9
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

ethmngr/Makefile

@@ -5,7 +5,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ethmngr
-PKG_VERSION:=2.1.0
+PKG_VERSION:=2.0.1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_VERSION:=5a0ff3bc7c49dcb05129f423ef8e0c4929f6aa03
@@ -23,7 +23,7 @@ define Package/ethmngr
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=Ethernet status and configration utility
-  DEPENDS:=+(TARGET_brcmbca||TARGET_airoha||TARGET_ipq95xx):libethernet +libuci +libubox +ubus +libpthread +libnl-genl
+  DEPENDS:=+libethernet +libuci +libubox +ubus +libpthread +libnl-genl
 endef
 
 define Package/ethmngr/description
@@ -37,24 +37,10 @@ TARGET_CFLAGS += \
 	-I$(STAGING_DIR)/usr/include/libnl3 \
 	-D_GNU_SOURCE
 
-ifeq ($(CONFIG_TARGET_brcmbca)$(CONFIG_TARGET_airoha)$(CONFIG_TARGET_ipq95xx),)
-define Build/Compile
-endef
-endif
-
 define Package/ethmngr/install
-	$(CP) ./files/common/* $(1)/
-ifneq ($(CONFIG_TARGET_brcmbca),)
-	$(CP) ./files/broadcom/* $(1)/
-else ifneq ($(CONFIG_TARGET_airoha),)
-	$(CP) ./files/airoha/* $(1)/
-else
-	$(CP) ./files/linux/* $(1)/
-endif
-ifneq ($(CONFIG_TARGET_brcmbca)$(CONFIG_TARGET_airoha)$(CONFIG_TARGET_ipq95xx),)
-	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_DIR) $(1)/etc/init.d $(1)/usr/sbin
+	$(INSTALL_BIN) ./files/ethmngr.init $(1)/etc/init.d/ethmngr
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ethmngr $(1)/usr/sbin/
-endif
 endef
 
 $(eval $(call BuildPackage,ethmngr))

ethmngr/files/airoha/lib/ethernet/airoha.sh

@@ -1,208 +0,0 @@
-#!/bin/sh
-
-. /lib/functions.sh
-
-unset -f switchmgr
-# alias for switchmgr
-switchmgr() {
-	"/userfs/bin/switchmgr" "$@"
-}
-
-unset -f tc3162_get_lan_port
-# get lan port port by ifname
-# arg1: port ifname, ex: eth0.1
-tc3162_get_lan_port() {
-	[[ -z "$1" ]] && return 255
-
-	local ifname="$1"
-	local if_idx=255
-
-	# only for tc3162 eth switch ports (eth0.x, 0 < x < 7)
-	case "${ifname}" in
-	eth0.*)
-		;;
-	*)
-		logger -t "port-management" \
-		"unsupported - ${ifname} is not tc3162 switch port"
-		return 255
-		;;
-	esac
-
-	let "if_idx=$(echo "${ifname}" | cut -f2 -d'.')"
-	[[ -z "${if_idx}" ]] && return 255
-	[[ ${if_idx} -lt 1 || ${if_idx} -gt 6 ]] && {
-		logger -t "port-management" \
-		"incorrect tc3162 lan port index ${if_idx} picked from ifname ${ifname}"
-		return 255
-	}
-	let "if_idx=${if_idx}-1"
-	return ${if_idx}
-}
-
-
-unset -f tc3162_get_mapped_port
-# get mapped switch port by ifname
-# arg1: port ifname, ex: eth0.1
-tc3162_get_mapped_port() {
-	[[ -z "$1" ]] && return 255
-
-	local ifname="$1"
-	local if_idx=255
-	local prtmap_procfile="/proc/tc3162/eth_portmap"
-	local lan_prt=255
-	local port=255
-	local prtmap_out_line_num=4
-	local prtmap_out_line=""
-	
-	# check "lan port map" marker in portmap output string
-	prtmap_out_line="$(sed -n "${prtmap_out_line_num}p" ${prtmap_procfile})"
-	[[ ${prtmap_out_line} != "lan_port_map" ]] && return 255
-
-	tc3162_get_lan_port "${ifname}"
-	let "if_idx=$?"
-	[[ -z "${if_idx}" || ${if_idx} -eq 255 ]] && return
-
-	# get lan portmapping string "lan_port mapped_port" for ifname by it's index
-	let "prtmap_out_line_num=${prtmap_out_line_num}+1+${if_idx}"
-	prtmap_out_line="$(sed -n "${prtmap_out_line_num}p" ${prtmap_procfile})"
-
-	# get and check lan port index from lan portmapping string
-	lan_prt=$(echo "${prtmap_out_line}" | cut -f 1 -d' ')
-	[[ -z "${lan_prt}" || "${if_idx}" != "${lan_prt}" ]] && return 255
-
-	# get and check mapped port from lan portmapping string
-	let "port=$(echo "${prtmap_out_line}" | cut -f 2 -d' ')"
-	[[ ${port} -lt 0 || ${port} -gt 255 ]] && return 255
-
-	return ${port}
-}
-
-unset -f get_max_port_speed
-# arg1: port ifname, ex: eth0.1
-get_max_port_speed() {
-	[[ -z "$1" ]] && { echo 0; return; }
-
-	local ifname="$1"
-	local port=255
-	local speed=0
-
-	[[ -d "/sys/class/net/${ifname}" ]] || {
-		logger -t "port-management" "interface ${ifname} is not found"
-		return
-	}
-
-	tc3162_get_lan_port "${ifname}"
-	let "port=$?"
-	[[ -z "${port}" || ${port} -eq 255 ]] && return
-
-	# tc3162 capability for all ports is 1Gbps
-	speed=1000
-
-	echo $speed
-}
-
-unset -f power_updown
-# arg1: port ifname, ex: eth0.1
-# arg2: port enabled, ex: 0/1/off/on/..
-power_updown() {
-	[[ -z "$1" ]] && return
-	[[ -z "$2" ]] && return
-
-	local ifname="$1"
-	local enabled="$2"
-	local port=255
-
-	[[ -d "/sys/class/net/${ifname}" ]] || {
-		logger -t "port-management" "interface ${ifname} is not found"
-		return
-	}
-
-	let "enabled=$(get_bool "${enabled}" "-1")"
-	[[ ${enabled} -eq -1 ]] && return
-
-	tc3162_get_lan_port "${ifname}"
-	let "port=$?"
-	[[ -z "${port}" || ${port} -eq 255 ]] && return
-
-	switchmgr phy admin "${port}" "${enabled}"
-}
-
-unset -f set_port_settings
-# arg1: port ifname, ex: eth0.1
-# arg2: port enabled, ex: 0/1/off/on/..
-# arg3: port speed, ex: 1000
-# arg4: port duplex, ex: full
-# arg5: port autoneg, ex: 0/1/off/on/..
-# arg6: port eee, ex: 0/1/off/on/..
-# arg7: port pause, ex: 0/1/off/on/..
-set_port_settings() {
-	[[ -z "$1" ]] && return
-	[[ -z "$2" ]] && return
-	[[ -z "$3" ]] && return
-	[[ -z "$4" ]] && return
-	[[ -z "$5" ]] && return
-	[[ -z "$6" ]] && return
-	[[ -z "$7" ]] && return
-
-	local ifname="$1"
-	local enabled="$2"
-	local speed="$3"
-	local duplex="$4"
-	local autoneg=$5
-	local eee="$6"
-	local pause="$7"
-	local port=255
-	local speedmode=1
-	local last_speed=0
-
-	[[ -d "/sys/class/net/${ifname}" ]] || {
-		logger -t "port-management" "interface ${ifname} is not found"
-		return
-	}
-	
-	let "enabled=$(get_bool "${enabled}" "-1")"
-	[[ ${enabled} -eq -1 ]] && return
-
-	let "autoneg=$(get_bool "${autoneg}" "-1")"
-	[[ ${autoneg} -eq -1 ]] && return
-
-	let "eee=$(get_bool "${eee}" "-1")"
-	[[ ${eee} -eq -1 ]] && return
-	
-	let "pause=$(get_bool "${pause}" "-1")"
-	[[ ${pause} -eq -1 ]] && return
-	
-	duplex="$(echo "${duplex}" | awk '{print tolower($0)}')"
-	[[ "${duplex}" != "half" && "${duplex}" != "full" ]] && return
-
-	tc3162_get_lan_port "${ifname}"
-	let "port=$?"
-	[[ -z "${port}" || ${port} -eq 255 ]] && return
-	
-	last_speed="$(switchmgr phy maxspeed "${port}" | cut -f2 -d':')"
-	[[ -z "${last_speed}" || "${last_speed}" == "*Down*" ]] \
-		&& last_speed=${speed}
-	
-	switchmgr phy pause "${port}" "${pause}"
-
-	# set speedmode: speed+duplex+autoneg
-# FIXME: switchmgr has no separate setting for 1Gbps speed - use autoneg instead
-	if [[ ${autoneg} -eq 1 || ${speed} -gt 100 ]]; then
-		switchmgr phy speedmode ${port} "1"
-	else
-		[[ ${speed} -gt 10 ]] && let "speedmode=2" || let "speedmode=4"
-		[[ "${duplex}" == "half" ]] && let "speedmode=${speedmode}+1"
-		switchmgr phy speedmode "${port}" "${speedmode}"
-	fi
-	
-# TODO: implement MAC control register manipulations (mapped ports used) for
-	# eee settings change
-	# separate (tx/rx) pause (flow control) settings change
-	# set speed to 1Gbps separately from autoneg mode
-	
-# FIXME: workaround for duplex/pause settings being not applied if speed is unchanged
-	[[ ${last_speed} -eq ${speed} ]] && power_updown "${ifname}" 0
-
-	power_updown "${ifname}" ${enabled}
-
-}

ethmngr/files/broadcom/lib/ethernet/broadcom.sh

@@ -1,140 +0,0 @@
-# arg1: port ifname, ex: eth0
-get_max_port_speed() {
-	if [ -z "$1" ]; then
-		echo 0
-		return
-	fi
-
-	local ifname="$1"
-	local phycap="$(ethctl $ifname media-type 2>/dev/null | grep 'PHY Capabilities' | awk '{print$NF}' | cut -d'|' -f1)"
-	local speed=1000
-
-	case "$phycap" in
-		10GFD) speed=10000 ;;
-		5GFD) speed=5000 ;;
-		2.5GFD) speed=2500 ;;
-		1GFD|1GHD) speed=1000 ;;
-		100MFD|100MHD) speed=100 ;;
-		10MFD|10MHD) speed=10 ;;
-	esac
-
-	echo $speed
-}
-
-# arg1: port name, ex: eth0
-get_port_number() {
-	[ -z "$1" ] && return
-	local ports="0 1 2 3 4 5 6 7"
-	local units="0 1"
-	local port="$1"
-	local ifname
-
-	for unit in $units; do
-		for prt in $ports; do
-			ifname="$(ethswctl getifname $unit $prt 2>/dev/null | awk '{print$NF}')"
-			if [ "$ifname" == "$port" ]; then
-				echo "$unit $prt"
-				return
-			fi
-		done
-	done
-}
-
-# arg1: port ifname, ex: eth0
-# arg2: port enabled, ex: 1
-power_updown() {
-	local ifname="$1"
-	local enabled=$2
-
-	local updown="up"
-	[ $enabled -eq 0 ] && updown="down"
-	ethctl $ifname phy-power $updown >/dev/null
-}
-
-# arg1: port ifname, ex: eth0
-# arg2: port enabled, ex: 1
-# arg3: port speed, ex: 1000
-# arg4: port duplex, ex: full
-# arg5: port autoneg, ex: on
-# arg6: port eee, ex: 0
-# arg7: port pause, ex: 0
-set_port_settings() {
-	local ifname="$1"
-	local enabled=$2
-	local speed="$3"
-	local duplex=$4
-	local autoneg=$5
-	local eee=$6
-	local pause=$7
-
-	[ -d /sys/class/net/$ifname ] || return
-
-	local unitport="$(get_port_number $ifname)"
-	local unit=$(echo $unitport | cut -d ' ' -f 1)
-	local port=$(echo $unitport | cut -d ' ' -f 2)
-
-	[ $autoneg -eq 1 ] && autoneg="on" || autoneg="off"
-	[ "$duplex" == "half" ] && duplex=0 || duplex=1
-	[ "$duplex" == 0 ] && dplx="HD" || dplx="FD"
-	[ "$autoneg" == "on" ] && media_type="auto" || media_type="$speed$dplx"
-
-	phycrossbar="$(ethctl $ifname phy-crossbar | head -1)"
-	crossbartype="$(echo $phycrossbar | awk '{print$2$3}')"
-	# Take only the last PHY Endpoint (non-Serdes) into account as Serdes port number precedes
-	[ "$crossbartype" == "oncrossbar" ] && pyhendpoint="$(echo $phycrossbar | awk '{print$NF}')"
-
-	phycaps="$(ethctl $ifname media-type ${pyhendpoint:+ port $pyhendpoint} | awk -F'PHY Capabilities: ' '{print$2}')"
-	numofcaps="$(echo $phycaps | tr '|' ' ' | wc -w)"
-
-	if [ "$numofcaps" == "1" ]; then
-		logger -t "port-management" "$ifname is capable of $phycaps only; not setting speed/duplex"
-	else
-		logger -t "port-management" "$ifname is capable of $phycaps; setting speed/duplex to $media_type"
-		ethctl $ifname media-type $media_type ${pyhendpoint:+ port $pyhendpoint} &>/dev/null
-	fi
-
-	[ $eee -eq 1 ] && eee="on" || eee="off"
-	ethtool --set-eee $ifname eee $eee 2>/dev/null
-
-	case $pause in
-		off|0)
-			pause=0x0
-			auto=off
-			rx=off
-			tx=off
-		;;
-		on|1)
-			pause=0x2
-			auto=off
-			rx=on
-			tx=on
-		;;
-		auto)
-			pause=0x1
-			auto=on
-			rx=on
-			tx=on
-		;;
-		tx)
-			pause=0x3
-			auto=off
-			rx=off
-			tx=on
-		;;
-		rx)
-			pause=0x4
-			auto=off
-			rx=on
-			tx=off
-		;;
-	esac
-	if [ "$auto" == "on" ]; then
-		# Use ethswctl utility to set pause autoneg
-		# as ethtool is not setting it properly
-		ethswctl -c pause -n $unit -p $port -v $pause 2>&1 >/dev/null
-	else
-		ethtool --pause $ifname autoneg $auto rx $rx tx $tx 2>/dev/null
-	fi
-
-	power_updown $ifname $enabled
-}

ethmngr/files/ethmngr.init

@@ -0,0 +1,19 @@
+#!/bin/sh /etc/rc.common
+
+START=95
+STOP=10
+
+USE_PROCD=1
+PROG=/usr/sbin/ethmngr
+
+start_service() {
+	procd_open_instance
+	procd_set_param command ${PROG}
+	procd_set_param respawn
+	procd_close_instance
+}
+
+reload_service() {
+        stop
+        start
+}

ethmngr/files/linux/lib/ethernet/linux.sh

@@ -1,95 +0,0 @@
-# arg1: port ifname, ex: eth0
-get_max_port_speed() {
-	if [ -z "$1" ]; then
-		echo 0
-		return
-	fi
-
-	local ifname="$1"
-	local phycap="$(ethtool $ifname | grep -A 10 "Supported link modes" | grep 000 | tail -n 1 | awk '{print$NF}')"
-	local speed=1000
-
-	case "$phycap" in
-		10000*) speed=10000 ;;
-		5000*) speed=5000 ;;
-		2500*) speed=2500 ;;
-		1000*) speed=1000 ;;
-		100*) speed=100 ;;
-		10*) speed=10 ;;
-	esac
-
-	echo $speed
-}
-
-# arg1: port ifname, ex: eth0
-# arg2: port enabled, ex: 1
-power_updown() {
-	local ifname="$1"
-	local enabled=$2
-
-	local updown="up"
-	[ $enabled -eq 0 ] && updown="down"
-	ip link set dev $ifname $updown
-}
-
-# arg1: port ifname, ex: eth0
-# arg2: port enabled, ex: 1
-# arg3: port speed, ex: 1000
-# arg4: port duplex, ex: full
-# arg5: port autoneg, ex: on
-# arg6: port eee, ex: 0
-# arg7: port pause, ex: 0
-set_port_settings() {
-	local ifname="$1"
-	local enabled=$2
-	local speed="$3"
-	local duplex=$4
-	local autoneg=$5
-	local eee=$6
-	local pause=$7
-
-	[ -d /sys/class/net/$ifname ] || return
-
-	[ $autoneg -eq 1 ] && autoneg="on" || autoneg="off"
-	ethtool --change $ifname speed $speed duplex $duplex autoneg $autoneg
-
-	[ $eee -eq 1 ] && eee="on" || eee="off"
-	ethtool --set-eee $ifname eee $eee 2>/dev/null
-
-	case $pause in
-		off|0)
-			pause=0x0
-			auto=off
-			rx=off
-			tx=off
-		;;
-		on|1)
-			pause=0x2
-			auto=off
-			rx=on
-			tx=on
-		;;
-		auto)
-			pause=0x1
-			auto=on
-			rx=on
-			tx=on
-		;;
-		tx)
-			pause=0x3
-			auto=off
-			rx=off
-			tx=on
-		;;
-		rx)
-			pause=0x4
-			auto=off
-			rx=on
-			tx=off
-		;;
-	esac
-
-	ethtool --pause $ifname autoneg $auto rx $rx tx $tx 2>/dev/null
-
-	power_updown $ifname $enabled
-}

icwmp/Makefile

@@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=9.1.5
+PKG_VERSION:=9.1.4
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/icwmp.git
-PKG_SOURCE_VERSION:=79284d1f4e16cf6077a7394f0c04a894b83a8a41
+PKG_SOURCE_VERSION:=fb8b5b9da6cadd53a3d12e27af0ed800b149a9f2
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 
@@ -93,8 +93,7 @@ define Package/icwmp/default/install
 	$(INSTALL_DATA) ./files/lib/upgrade/keep.d/icwmp $(1)/lib/upgrade/keep.d/icwmp
 	$(INSTALL_BIN) ./files/etc/icwmpd/update.sh $(1)/etc/icwmpd/update.sh
 	$(INSTALL_DATA) ./files/etc/bbfdm/json/CWMPManagementServer.json $(1)/etc/bbfdm/json/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/files/etc/udhcpc.user.d/udhcpc_icwmp_opt125.user $(1)/etc/udhcpc.user.d/udhcpc_icwmp_opt125.user
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/files/etc/udhcpc.user.d/udhcpc_icwmp_opt43.user $(1)/etc/udhcpc.user.d/udhcpc_icwmp_opt43.user
+	$(INSTALL_BIN) ./files/etc/udhcpc.user.d/udhcpc_icwmp.user $(1)/etc/udhcpc.user.d/udhcpc_icwmp.user
 endef
 
 Package/icwmp-openssl/install = $(Package/icwmp/default/install)

icwmp/files/etc/udhcpc.user.d/udhcpc_icwmp.user

@@ -0,0 +1,133 @@
+#!/bin/sh
+
+. /lib/functions.sh
+
+CLASS=""
+OUI=""
+SERIAL=""
+
+get_vivsoi() {
+	# opt125 environment variable has data in below format
+	# +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+	# |	 enterprise-number1	  |
+	# |				  |
+	# +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+	# |   data-len1   |		  |
+	# +-+-+-+-+-+-+-+-+ option-data1  |
+	# /				  /
+	# +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ -----
+	# |	 enterprise-number2	  |   ^
+	# |				  |   |
+	# +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+   |
+	# |   data-len2   |		  | optional
+	# +-+-+-+-+-+-+-+-+ option-data2  |   |
+	# /				  /   |
+	# +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+   |
+	# ~	       ...		  ~   V
+	# +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ -----
+
+	#  Enterprise Id  Len  Sub Op  SLen  Data Sub Op  SLen Data	  Sub Op  SLen Data
+	# +-------------+-----+------+------+----+------+-----+----+-----+------+-----+----+
+	# |	id    |  n  |	1  |  n1  | D1 |   2  |  n2 | D2 | ... |   6  |  n6 | D6 |
+	# +-------------+-----+------+------+----+------+-----+----+-----+------+-----+----+
+
+	local opt125="$1"
+	local len="$2"
+	local ent_id
+
+	#hex-string 2 character=1 Byte
+	# length in hex string will be twice of actual Byte length
+	[ "$len" -gt "8" ] || return
+
+	data="${opt125}"
+	rem_len="${len}"
+	while [ $rem_len -gt 0 ]; do
+		ent_id=${data:0:8}
+		ent_id=$(printf "%d\n" "0x$ent_id")
+
+		if [ $ent_id -ne  3561 ]; then
+			len_val=${data:8:2}
+			data_len=$(printf "%d\n" "0x$len_val")
+			# add 4 byte for ent_id and 1 byte for len
+			data_len=$(( data_len * 2 + 10 ))
+			# move ahead data to next enterprise id
+			data=${data:"${data_len}":"${rem_len}"}
+			rem_len=$(( rem_len - $data_len ))
+			continue
+		fi
+
+		# read the length of enterprise data
+		len_val=${data:8:2}
+		opt_len=$(printf "%d\n" "0x$len_val")
+		[ $opt_len -eq 0 ] && return
+
+		# populate the option data of enterprise id
+		sub_data_len=$(( opt_len * 2))
+		# starting 10 means ahead of length field
+		sub_data=${data:10:"${sub_data_len}"}
+
+		# parsing of suboption of option 125
+		while [ $sub_data_len -gt 0 ]; do
+			# get the suboption id
+			sub_opt_id=${sub_data:0:2}
+			sub_opt_id=$(printf "%d\n" "0x$sub_opt_id")
+
+			# get the length of suboption
+			sub_opt_len=${sub_data:2:2}
+			sub_opt_len=$(printf "%d\n" "0x$sub_opt_len")
+			sub_opt_len=$(( sub_opt_len * 2 ))
+
+			# get the value of sub option starting 4 means starting after length
+			sub_opt_val=${sub_data:4:${sub_opt_len}}
+
+			# assign the value found in sub option
+			case "${sub_opt_id}" in
+				"4") OUI=$(echo -n $sub_opt_val | sed 's/\([0-9A-F]\{2\}\)/\\\\\\x\1/gI' | xargs printf && echo '')
+				;;
+				"5") SERIAL=$(echo -n $sub_opt_val | sed 's/\([0-9A-F]\{2\}\)/\\\\\\x\1/gI' | xargs printf && echo '')
+				;;
+				"6") CLASS=$(echo -n $sub_opt_val | sed 's/\([0-9A-F]\{2\}\)/\\\\\\x\1/gI' | xargs printf && echo '')
+				;;
+			esac
+
+			# add 2 bytes for sub_opt id and sub_opt len field
+			sub_opt_end=$(( sub_opt_len + 4 ))
+
+			# fetch next sub option hex string
+			sub_data=${sub_data:${sub_opt_end}:${sub_data_len}}
+
+			# update the remaining sub option hex string length
+			sub_data_len=$((sub_data_len - sub_opt_end))
+		done
+
+		break
+	done
+}
+
+config_load cwmp
+config_get_bool enable_cwmp cpe enable 1
+config_get wan_intf cpe default_wan_interface "wan"
+
+if [ "$enable_cwmp" = "0" ]; then
+	return 0
+fi
+
+if [ "${wan_intf}" == "${INTERFACE}" ]; then
+	if [ -n "$opt125" ]; then
+		len=$(printf "$opt125"|wc -c)
+		get_vivsoi "$opt125" "$len"
+	fi
+
+	mkdir -p /var/state
+	touch /var/state/cwmp
+	sec=$(uci -q -c /var/state get cwmp.gatewayinfo)
+	if [ -z "${sec}" ]; then
+		sec=$(uci -q -c /var/state add cwmp gatewayinfo)
+		uci -q -c /var/state rename cwmp."${sec}"="gatewayinfo"
+	fi
+
+	uci -q -c /var/state set cwmp.gatewayinfo.class="$CLASS"
+	uci -q -c /var/state set cwmp.gatewayinfo.oui="$OUI"
+	uci -q -c /var/state set cwmp.gatewayinfo.serial="$SERIAL"
+	uci -q -c /var/state commit cwmp
+fi

ieee1905/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ieee1905
-PKG_VERSION:=7.0.2
+PKG_VERSION:=6.0.21
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=47c04c502edf441fef9f14307be5f07541614049
+PKG_SOURCE_VERSION:=29f58120eea9bf3c48fae98a74f0f4c9d3d902a8
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/ieee1905.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip

iop/config

@@ -56,7 +56,8 @@ CONFIG_LOCALMIRROR="https://download.iopsys.eu/iopsys/mirror/"
 
 # EasySoC HAL #
 CONFIG_PACKAGE_inbd=y
-CONFIG_PACKAGE_qosmngr=y
+CONFIG_PACKAGE_libwifi=y
+CONFIG_PACKAGE_port-management=y
 CONFIG_PACKAGE_wifimngr=y
 
 # Multi-AP #

map-agent/Makefile

@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-agent
-PKG_VERSION:=4.1.0.0
+PKG_VERSION:=2.10.4.17
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=035a398ae9e23612816cba8eeb8477997135a840
+PKG_SOURCE_VERSION:=098fef903c1e746776f88df3706337b8fc3899ac
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
 
 PKG_LICENSE:=BSD-3-Clause

map-controller/Makefile

@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-controller
-PKG_VERSION:=4.1.0.0
+PKG_VERSION:=2.11.0.24
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=473c4a547c34af0f3b09cb7a110e5cff90abc191
+PKG_SOURCE_VERSION:=8944352f648643fa5c72cd216a76695a021b7851
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
@@ -26,7 +26,7 @@ define Package/map-controller
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=WiFi Multi-AP Controller (EasyMesh R2)
-  DEPENDS:=+libuci +libubox +ubus +libeasy +libieee1905 +ieee1905 +map-plugin +libwifi
+  DEPENDS:=+libuci +libubox +ubus +libeasy +libieee1905 +ieee1905 +map-plugin
 endef
 
 define Package/map-controller/description

map-controller/files/etc/init.d/mapcontroller

@@ -45,13 +45,7 @@ validate_sta_steering_section() {
 		'use_bcn_metrics:bool:false' \
 		'use_usta_metrics:bool:false' \
 		'bandsteer:bool:false' \
-		'diffsnr:range(0,100)' \
-		'rcpi_threshold_2g:range(0,220)' \
-		'rcpi_threshold_5g:range(0,220)' \
-		'rcpi_threshold_6g:range(0,220)' \
-		'report_rcpi_threshold_2g:range(0,220)' \
-		'report_rcpi_threshold_5g:range(0,220)' \
-		'report_rcpi_threshold_6g:range(0,220)'
+		'diffsnr:range(0,100)'
 
 	[ "$?" -ne 0 ] && {
 		logger -s -t "mapcontroller" "Validation of sta_steering section failed"

ponmngr/files/etc/bbfdm/json/xpon.json

@@ -3,7 +3,6 @@
 	"Device.XPON.": {
 		"type": "object",
 		"protocols": [
-			"cwmp",
 			"usp"
 		],
 		"access": false,
@@ -14,7 +13,6 @@
 			"read": true,
 			"write": false,
 			"protocols": [
-				"cwmp",
 				"usp"
 			],
 			"datatype": "unsignedInt",
@@ -33,7 +31,6 @@
 		"Device.XPON.ONU.{i}.": {
 			"type": "object",
 			"protocols": [
-				"cwmp",
 				"usp"
 			],
 			"access": false,
@@ -54,7 +51,6 @@
 				"read": true,
 				"write": false,
 				"protocols": [
-					"cwmp",
 					"usp"
 				],
 				"datatype": "boolean",
@@ -71,7 +67,6 @@
 				"read": true,
 				"write": false,
 				"protocols": [
-					"cwmp",
 					"usp"
 				],
 				"datatype": "string",
@@ -93,7 +88,6 @@
 				"read": true,
 				"write": false,
 				"protocols": [
-					"cwmp",
 					"usp"
 				],
 				"datatype": "string",
@@ -115,7 +109,6 @@
 				"read": true,
 				"write": false,
 				"protocols": [
-					"cwmp",
 					"usp"
 				],
 				"datatype": "unsignedInt",
@@ -136,7 +129,6 @@
 				"read": true,
 				"write": false,
 				"protocols": [
-					"cwmp",
 					"usp"
 				],
 				"datatype": "unsignedInt",
@@ -157,7 +149,6 @@
 				"read": true,
 				"write": false,
 				"protocols": [
-					"cwmp",
 					"usp"
 				],
 				"datatype": "unsignedInt",
@@ -173,31 +164,9 @@
 					}
 				]
 			},
-			"TransceiverNumberOfEntries": {
-				"type": "unsignedInt",
-				"read": true,
-				"write": false,
-				"protocols": [
-					"cwmp",
-					"usp"
-				],
-				"datatype": "unsignedInt",
-				"mapping": [
-					{
-						"type": "ubus",
-						"ubus": {
-							"object": "xpon",
-							"method": "status",
-							"args": {},
-							"key": "ONU[@index].Transceiver.@Count"
-						}
-					}
-				]
-			},
 			"Device.XPON.ONU.{i}.SoftwareImage.{i}.": {
 				"type": "object",
 				"protocols": [
-					"cwmp",
 					"usp"
 				],
 				"access": false,
@@ -218,7 +187,6 @@
 					"read": true,
 					"write": false,
 					"protocols": [
-						"cwmp",
 						"usp"
 					],
 					"datatype": "unsignedInt",
@@ -241,7 +209,6 @@
 					"read": true,
 					"write": false,
 					"protocols": [
-						"cwmp",
 						"usp"
 					],
 					"datatype": "string",
@@ -263,7 +230,6 @@
 					"read": true,
 					"write": false,
 					"protocols": [
-						"cwmp",
 						"usp"
 					],
 					"datatype": "boolean",
@@ -280,7 +246,6 @@
 					"read": true,
 					"write": false,
 					"protocols": [
-						"cwmp",
 						"usp"
 					],
 					"datatype": "boolean",
@@ -297,7 +262,6 @@
 					"read": true,
 					"write": false,
 					"protocols": [
-						"cwmp",
 						"usp"
 					],
 					"datatype": "boolean",
@@ -313,7 +277,6 @@
 			"Device.XPON.ONU.{i}.EthernetUNI.{i}.": {
 				"type": "object",
 				"protocols": [
-					"cwmp",
 					"usp"
 				],
 				"access": false,
@@ -334,7 +297,6 @@
 					"read": true,
 					"write": false,
 					"protocols": [
-						"cwmp",
 						"usp"
 					],
 					"datatype": "boolean",
@@ -351,7 +313,6 @@
 					"read": true,
 					"write": false,
 					"protocols": [
-						"cwmp",
 						"usp"
 					],
 					"datatype": "string",
@@ -377,7 +338,6 @@
 					"read": true,
 					"write": false,
 					"protocols": [
-						"cwmp",
 						"usp"
 					],
 					"datatype": "string",
@@ -399,7 +359,6 @@
 					"read": true,
 					"write": false,
 					"protocols": [
-						"cwmp",
 						"usp"
 					],
 					"datatype": "string",
@@ -421,7 +380,6 @@
 					"read": true,
 					"write": false,
 					"protocols": [
-						"cwmp",
 						"usp"
 					],
 					"datatype": "string",
@@ -441,7 +399,6 @@
 				"Device.XPON.ONU.{i}.EthernetUNI.{i}.Stats.": {
 					"type": "object",
 					"protocols": [
-						"cwmp",
 						"usp"
 					],
 					"access": false,
@@ -458,7 +415,6 @@
 						"read": true,
 						"write": false,
 						"protocols": [
-							"cwmp",
 							"usp"
 						],
 						"datatype": "unsignedLong",
@@ -475,7 +431,6 @@
 						"read": true,
 						"write": false,
 						"protocols": [
-							"cwmp",
 							"usp"
 						],
 						"datatype": "unsignedLong",
@@ -492,7 +447,6 @@
 						"read": true,
 						"write": false,
 						"protocols": [
-							"cwmp",
 							"usp"
 						],
 						"datatype": "unsignedLong",
@@ -509,7 +463,6 @@
 						"read": true,
 						"write": false,
 						"protocols": [
-							"cwmp",
 							"usp"
 						],
 						"datatype": "unsignedLong",
@@ -526,7 +479,6 @@
 			"Device.XPON.ONU.{i}.ANI.{i}.": {
 				"type": "object",
 				"protocols": [
-					"cwmp",
 					"usp"
 				],
 				"access": false,
@@ -547,7 +499,6 @@
 					"read": true,
 					"write": true,
 					"protocols": [
-						"cwmp",
 						"usp"
 					],
 					"datatype": "boolean",
@@ -578,7 +529,6 @@
 					"read": true,
 					"write": false,
 					"protocols": [
-						"cwmp",
 						"usp"
 					],
 					"datatype": "string",
@@ -603,7 +553,6 @@
 					"read": true,
 					"write": false,
 					"protocols": [
-						"cwmp",
 						"usp"
 					],
 					"datatype": "string",
@@ -624,7 +573,6 @@
 				"Device.XPON.ONU.{i}.ANI.{i}.Stats.": {
 					"type": "object",
 					"protocols": [
-						"cwmp",
 						"usp"
 					],
 					"access": false,
@@ -641,7 +589,6 @@
 						"read": true,
 						"write": false,
 						"protocols": [
-							"cwmp",
 							"usp"
 						],
 						"datatype": "unsignedLong",
@@ -658,7 +605,6 @@
 						"read": true,
 						"write": false,
 						"protocols": [
-							"cwmp",
 							"usp"
 						],
 						"datatype": "unsignedLong",
@@ -675,7 +621,6 @@
 						"read": true,
 						"write": false,
 						"protocols": [
-							"cwmp",
 							"usp"
 						],
 						"datatype": "unsignedLong",
@@ -692,7 +637,6 @@
 						"read": true,
 						"write": false,
 						"protocols": [
-							"cwmp",
 							"usp"
 						],
 						"datatype": "unsignedLong",
@@ -705,111 +649,6 @@
 						]
 					}
 				}
-			},
-			"Device.XPON.ONU.{i}.Transceiver.{i}.": {
-				"type": "object",
-				"protocols": [
-					"cwmp",
-					"usp"
-				],
-				"access": false,
-				"array": true,
-				"mapping": [
-					{
-						"type": "ubus",
-						"ubus": {
-							"object": "xpon",
-							"method": "status",
-							"args": {},
-							"key": "ONU[@index].Transceiver"
-						}
-					}
-				],
-				"RxPower": {
-					"type": "int",
-					"read": true,
-					"write": false,
-					"protocols": [
-						"cwmp",
-						"usp"
-					],
-					"datatype": "int",
-					"mapping": [
-						{
-							"data": "@Parent",
-							"type": "json",
-							"key": "RxPower"
-						}
-					]
-				},
-				"TxPower": {
-					"type": "int",
-					"read": true,
-					"write": false,
-					"protocols": [
-						"cwmp",
-						"usp"
-					],
-					"datatype": "int",
-					"mapping": [
-						{
-							"data": "@Parent",
-							"type": "json",
-							"key": "TxPower"
-						}
-					]
-				},
-				"Voltage": {
-					"type": "unsignedInt",
-					"read": true,
-					"write": false,
-					"protocols": [
-						"cwmp",
-						"usp"
-					],
-					"datatype": "unsignedInt",
-					"mapping": [
-						{
-							"data": "@Parent",
-							"type": "json",
-							"key": "Voltage"
-						}
-					]
-				},
-				"Bias": {
-					"type": "unsignedInt",
-					"read": true,
-					"write": false,
-					"protocols": [
-						"cwmp",
-						"usp"
-					],
-					"datatype": "unsignedInt",
-					"mapping": [
-						{
-							"data": "@Parent",
-							"type": "json",
-							"key": "Bias"
-						}
-					]
-				},
-				"Temperature": {
-					"type": "int",
-					"read": true,
-					"write": false,
-					"protocols": [
-						"cwmp",
-						"usp"
-					],
-					"datatype": "int",
-					"mapping": [
-						{
-							"data": "@Parent",
-							"type": "json",
-							"key": "Temperature"
-						}
-					]
-				}
 			}
 		}
 	}

port-management/Makefile

@@ -0,0 +1,31 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=port-management
+PKG_VERSION:=1.1.0
+PKG_RELEASE:=1
+PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
+PKG_LICENSE:=GPL-2.0-only
+include $(INCLUDE_DIR)/package.mk
+
+define Package/port-management
+  CATEGORY:=Utilities
+  TITLE:=Port management tool
+endef
+
+define Package/port-management/description
+	Port configuration utility
+endef
+
+define Build/Prepare
+	mkdir -p $(PKG_BUILD_DIR)
+	$(CP) ./files/* $(PKG_BUILD_DIR)/
+endef
+
+define Build/Compile
+endef
+
+define Package/port-management/install
+	$(CP) ./files/* $(1)/
+endef
+
+$(eval $(call BuildPackage,port-management))

port-management/files/etc/init.d/port_management

@@ -1,15 +1,12 @@
 #!/bin/sh /etc/rc.common
 
 START=15
-STOP=90
-
 USE_PROCD=1
-PROG=/usr/sbin/ethmngr
 
 . /lib/functions.sh
-include /lib/ethernet
+include /lib/network
 
-configure_ethernet_port(){
+configure_ports(){
 	local cfg=$1
 	local ifname enabled speed duplex autoneg eee pause
 
@@ -27,22 +24,11 @@ configure_ethernet_port(){
 }
 
 start_service() {
-	if [ -s /etc/config/ports ]; then
-		config_load ports
-		config_foreach configure_ethernet_port ethport
-	fi
+	[ -f /lib/network/port.sh ] || return
 
-	if [ -f $PROG ]; then
-		procd_open_instance
-		procd_set_param command ${PROG}
-		procd_set_param respawn
-		procd_close_instance
-	fi
-}
-
-reload_service() {
-        stop
-        start
+	config_load ports
+	config_foreach configure_ports ethport
+	config_foreach configure_ports sfpport
 }
 
 service_triggers() {

port-management/files/etc/uci-defaults/15-ports-config-generate

@@ -2,8 +2,7 @@
 
 populate_config_from_db() {
 	. /lib/functions.sh
-	. /lib/network/utils.sh
-	include /lib/ethernet
+	include /lib/network
 
 	portorder="$(db -q get hw.board.ethernetPortOrder)"
 	for port in $portorder; do

qosmngr/Makefile

@@ -27,7 +27,7 @@ define Package/qosmngr
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=QoS Manager
-  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libqos +!(TARGET_brcmbca||TARGET_airoha):tc-full
+  DEPENDS:=@(TARGET_brcmbca||TARGET_airoha||TARGET_iopsys_mediatek) +libuci +libubox +libubus +libblobmsg-json +libjson-c +libqos
 endef
 
 define Package/qosmngr/description
@@ -40,17 +40,32 @@ define Build/Prepare
 endef
 endif
 
-define Package/qosmngr/install
+define Package/qosmngr/install/common
 	$(CP) ./files/common/* $(1)/
-ifneq ($(CONFIG_TARGET_brcmbca),)
-	$(CP) ./files/broadcom/* $(1)/
-else ifneq ($(CONFIG_TARGET_airoha),)
-	$(CP) ./files/airoha/* $(1)/
-else
-	$(CP) ./files/linux/* $(1)/
-endif
+	$(INSTALL_DIR) $(1)/usr
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/qosmngr $(1)/usr/sbin
 endef
 
+ifeq ($(CONFIG_TARGET_brcmbca),y)
+define Package/qosmngr/install
+	$(CP) ./files/broadcom/* $(1)/
+	$(call Package/qosmngr/install/common,$(1))
+endef
+endif
+
+ifeq ($(CONFIG_TARGET_airoha),y)
+define Package/qosmngr/install
+	$(CP) ./files/airoha/* $(1)/
+	$(call Package/qosmngr/install/common,$(1))
+endef
+endif
+
+ifeq ($(CONFIG_TARGET_iopsys_mediatek),y)
+define Package/qosmngr/install
+	$(CP) ./files/linux/* $(1)/
+	echo "Honoring the flag mediatek"
+	$(call Package/qosmngr/install/common,$(1))
+endef
+endif
 $(eval $(call BuildPackage,qosmngr))

qosmngr/files/airoha/lib/qos/qos.sh

@@ -2,7 +2,7 @@
 # The entrypoint for the QoS setup library
 
 . /lib/functions.sh
-include /lib/ethernet
+. /lib/network/port.sh
 
 . /lib/qos/common/chains.sh
 . /lib/qos/common/chains.ebtables.sh

qosmngr/files/broadcom/lib/qos/qos.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 . /lib/functions.sh
-include /lib/ethernet
+. /lib/network/port.sh
 
 IP_RULE=""
 BR_RULE=""

qosmngr/files/linux/etc/uci-defaults/60-qos_config_generate

@@ -4,18 +4,6 @@
 
 ethwan="$(db -q get hw.board.ethernetWanPort)"
 
-populate_no_of_queue(){
-    queue_num=8
-
-    # writing no. of queue per port into file and read on classify generate
-    if [ ! -d "/tmp/qos" ]; then
-            mkdir -p "/tmp/qos"
-    fi
-    no_queue_file="/tmp/qos/no_queue_per_port"
-    touch "$no_queue_file"
-    echo $queue_num >"$no_queue_file"
-}
-
 generate_queue(){
 	section="$1"
 
@@ -41,8 +29,6 @@ generate_queue(){
 	uci commit qos
 }
 
-populate_no_of_queue
-
 if [ -s "/etc/config/qos" ]; then
 	if uci -q get qos.@queue[0] >/dev/null; then
 		# return if there is any valid content

qosmngr/files/linux/lib/qos/qos.sh

@@ -70,7 +70,7 @@ handle_queue() {
 	local port_bw="$3"
 	local root="$4"
 	local port_bs="$5"
-	local priority=0
+
 	config_get is_enable "$qid" "enable"
 
 	# no need to configure disabled queues
@@ -127,17 +127,21 @@ handle_queue() {
 
 	# ignore precedence value in case of WRR, broadcom recommends that WRR queue should
 	# always have precedence value set to 0
-	if [ $salg -ne 2 ]; then
-	       priority=$order
+	if [ $salg -eq 2 ]; then
+	       order=0
 	fi
-	if [ $order -ne 0 ]; then
-		if [ $salg -eq 2 ]; then
-			tc class add dev $port parent ${root}: classid ${root}:$order cbq allot $bs bandwidth ${port_bw}kbit rate ${rate}kbit prio $priority weight $wgt  avpkt 1500 bounded isolated
-		else
-			tc class add dev $port parent ${root}: classid ${root}:$order cbq allot $bs bandwidth ${port_bw}kbit rate ${rate}kbit prio $priority  avpkt 1500 bounded isolated
-		fi
-		tc filter add dev $port parent ${root}:0 prio $order handle $order fw classid ${root}:$order
+
+	if [ $salg -eq 2 ]; then
+		tc class add dev $port parent ${root}: classid ${root}:$((order + 1)) cbq allot $bs bandwidth ${port_bw}kbit rate ${rate}kbit prio $order weight $wgt  avpkt 1500 bounded isolated
+	else
+		tc class add dev $port parent ${root}: classid ${root}:$((order + 1)) cbq allot $bs bandwidth ${port_bw}kbit rate ${rate}kbit prio $order  avpkt 1500 bounded isolated
 	fi
+	
+	if [ $order -eq 0 ]; then
+		# By default flowid is targeted to queue 1.
+		tc filter add dev $port parent ${root}:0 protocol ip prio 1 u32 match u32 0 0  flowid ${root}:0
+	fi
+
 	Q_COUNT=$((Q_COUNT + 1))
 }
 
@@ -170,10 +174,6 @@ setup_qos() {
 		ebtables -t broute -I BROUTING -j qos
 	fi
 
-	iptables -w -t mangle -N qos_prerouting
-	ret=$?
-	[ $ret -eq 0 ] && iptables -w -t mangle -I PREROUTING -j qos_prerouting
-
 	iptables -w -t mangle -N qos_forward
 	ret=$?
 	[ $ret -eq 0 ] && iptables -w -t mangle -I FORWARD -j qos_forward
@@ -182,9 +182,9 @@ setup_qos() {
 	ret=$?
 	[ $ret -eq 0 ] && iptables -w -t mangle -I OUTPUT -j qos_output
 
-	ip6tables -w -t mangle -N qos_prerouting
+	iptables -w -t mangle -N qos_postrouting
 	ret=$?
-	[ $ret -eq 0 ] && ip6tables -w -t mangle -I PREROUTING -j qos_prerouting
+	[ $ret -eq 0 ] && iptables -w -t mangle -I POSTROUTING -j qos_postrouting
 
 	ip6tables -t mangle -N qos_forward
 	ret=$?
@@ -194,16 +194,19 @@ setup_qos() {
 	ret=$?
 	[ $ret -eq 0 ] && ip6tables -t mangle -I OUTPUT -j qos_output
 
+	ip6tables -w -t mangle -N qos_postrouting
+	ret=$?
+	[ $ret -eq 0 ] && ip6tables -w -t mangle -I POSTROUTING -j qos_postrouting
 }
 
 flush_chains() {
         echo "iptables -w -t mangle -F qos_forward" > /tmp/qos/classify.iptables
         echo "iptables -w -t mangle -F qos_output" >> /tmp/qos/classify.iptables
-	echo "iptables -w -t mangle -F qos_prerouting" >> /tmp/qos/classify.iptables
+        echo "iptables -w -t mangle -F qos_postrouting" >> /tmp/qos/classify.iptables
 
         echo "ip6tables -w -t mangle -F qos_forward" > /tmp/qos/classify.ip6tables
         echo "ip6tables -w -t mangle -F qos_output" >> /tmp/qos/classify.ip6tables
-	echo "ip6tables -w -t mangle -F qos_prerouting" >> /tmp/qos/classify.ip6tables
+        echo "ip6tables -w -t mangle -F qos_postrouting" >> /tmp/qos/classify.ip6tables
 }
 
 init_iptables_rule() {
@@ -211,7 +214,7 @@ init_iptables_rule() {
 }
 
 iptables_filter_intf() {
-        IP_RULE="$IP_RULE -i $1"
+        IP_RULE="$IP_RULE -o $1"
 }
 
 iptables_filter_proto() {
@@ -259,7 +262,7 @@ iptables_set_dscp_mark() {
 }
 
 iptables_set_traffic_class() {
-        IP_RULE="$IP_RULE  -j MARK --set-mark $1"
+        IP_RULE="$IP_RULE  -j CLASSIFY --set-class ${MAJOR}:$1"
 }
 
 append_rule_to_mangle_table() {
@@ -382,13 +385,14 @@ handle_iptables_rules() {
 
         #write iptables rule for dscp marking
         [ -n "$IP_RULE" -a -n "$dscp_mark" ] && append_rule_to_mangle_table "qos_forward" $ip_version
+
         if [ -n "$IP_RULE" -a -n "$traffic_class" ]; then
                 if [ "$ifname" == "lo" ]; then
                         #write iptables rule for putting WAN directed internal packets in different queue
                         append_rule_to_mangle_table "qos_output" $ip_version
                 else
                         #write iptables rule for putting WAN directed LAN packets in different queue
-                        append_rule_to_mangle_table "qos_prerouting" $ip_version
+                        append_rule_to_mangle_table "qos_postrouting" $ip_version
                 fi
         fi
 }
@@ -510,6 +514,11 @@ handle_classify() {
 	local corder_file="/tmp/qos/classify.order"
 	while read -r line; do
 		line_cid=$(echo $line | cut -d '_' -f 2)
+		config_get is_enable "$line_cid" "enable"
+		# no need to configure disabled classify rules
+		if [ "$is_enable" == '0' ]; then
+			continue
+		fi
                 handle_iptables_rules $line_cid
                 handle_policer_rules $line_cid
         done < "$corder_file"
@@ -517,16 +526,17 @@ handle_classify() {
 
 configure_classify() {
         #processing classify section
-        rm -f /tmp/qos/classify.iptables
-        rm -f /tmp/qos/classify.ip6tables
 	rm -f /tmp/qos/classify.order
+	rm -f /tmp/qos/tmp_classify.order
+	rm -f /tmp/qos/classify.iptables
+	rm -f /tmp/qos/classify.ip6tables
 
         # create files that will contain the rules if not present already
         mkdir -p /tmp/qos/
         touch /tmp/qos/classify.iptables
         touch /tmp/qos/classify.ip6tables
-	touch /tmp/qos/classify.order
-
+        touch /tmp/qos/classify.order
+        touch /tmp/qos/tmp_classify.order
 	flush_chains
 
         # Load UCI file

usermngr/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=usermngr
-PKG_VERSION:=1.0.5
+PKG_VERSION:=1.0.4
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/usermngr.git
-PKG_SOURCE_VERSION:=91cddabfdcd496a3c52d4206b72215a938185332
+PKG_SOURCE_VERSION:=9d5f529e236e03c91e41c421de7702923a24664e
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

wfa-capi/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=wfa-capi
-PKG_VERSION:=2.0.1
+PKG_VERSION:=1.1.3
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=3e671db8f567b19c109fc13b25bc571c4c73a962
+PKG_SOURCE_VERSION:=64d9101c8e4930cbd3fe6ce471fb4cfd2b9b80dc
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/wfa-capi.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip

wfadatad/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=wfadatad
-PKG_VERSION:=4.0.0.1
+PKG_VERSION:=2.11.0.4
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=574d22ed710ff4dae441f7c0273b05bbfd5c33ed
+PKG_SOURCE_VERSION:=24dcb18f3e60082c70ab17b0707073fd2981f0a9
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/wfadatad.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
@@ -22,6 +22,18 @@ PKG_LICENSE_FILES:=LICENSE
 
 include $(INCLUDE_DIR)/package.mk
 
+define Package/wfadatad
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE:=WiFi DataElements Agent (standalone) daemon
+  DEPENDS:=+libwifi +libuci +libubox +ubus +libpthread +libnl-genl \
+	   @(!PACKAGE_map-agent) +libieee1905 +map-plugin
+endef
+
+define Package/wfadatad/description
+ This package implements WiFi DataElements Agent.
+endef
+
 define Package/wfadatad-collector
   SECTION:=utils
   CATEGORY:=Utilities
@@ -48,6 +60,7 @@ MAKE_FLAGS += DEBUG=1
 endif
 
 TARGET_CFLAGS += \
+	-Wno-error=deprecated-declarations \
 	-I$(STAGING_DIR)/usr/include \
 	-I$(STAGING_DIR)/usr/include/libnl3 \
 	-D_GNU_SOURCE
@@ -63,15 +76,25 @@ MAKE_PATH:=src
 TARGET_CFLAGS += -DEASYMESH_VERSION=$(CONFIG_DECOLLECTOR_EASYMESH_VERSION)
 
 EXECS := \
-	$(if $(CONFIG_PACKAGE_wfadatad-collector),decollector)
+	$(if $(CONFIG_PACKAGE_wfadatad),agent/deagent) \
+	$(if $(CONFIG_PACKAGE_wfadatad-collector),collector/decollector)
 
 MAKE_FLAGS += EXECS="$(EXECS)"
 
+
+define Package/wfadatad/install
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) ./files/deagent.init $(1)/etc/init.d/deagent
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/agent/deagent $(1)/usr/sbin/
+endef
+
 define Package/wfadatad-collector/install
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) ./files/decollector.init $(1)/etc/init.d/decollector
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/decollector $(1)/usr/sbin/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/collector/decollector $(1)/usr/sbin/
 endef
 
+$(eval $(call BuildPackage,wfadatad))
 $(eval $(call BuildPackage,wfadatad-collector))

wifimngr/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=wifimngr
-PKG_VERSION:=15.0.3
+PKG_VERSION:=14.3.2
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=4ab6a59e1666581a96bde393f522cc9301cbf78d
+PKG_SOURCE_VERSION:=b8cd9f543756f49a4da2d02cce45094f1544d920
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/wifimngr.git
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz