map_agent: reload wireless after uci commit

Signed-off-by: Janusz Dziedzic <janusz.dziedzic@iopsys.eu>

icwmp/Makefile

@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=9.5.29
+PKG_VERSION:=9.5.27
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/icwmp.git
-PKG_SOURCE_VERSION:=f9a7bb027a754710353172fa1aec095c08c90832
+PKG_SOURCE_VERSION:=ce1f7e01f0f5e7cc3a5dfeb5378d488f3e2938a0
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -102,7 +102,6 @@ define Package/icwmp/default/install
 	$(INSTALL_BIN) ./files/etc/uci-defaults/85-cwmp-set-userid $(1)/etc/uci-defaults/
 	$(INSTALL_BIN) ./files/etc/uci-defaults/90-cwmpfirewall $(1)/etc/uci-defaults/
 	$(INSTALL_BIN) ./files/etc/uci-defaults/95-set-random-inform-time $(1)/etc/uci-defaults/
-	$(INSTALL_BIN) ./files/etc/icwmpd/uci_stuck_workaround.sh $(1)/etc/icwmpd/uci_stuck_workaround.sh
 	$(INSTALL_DATA) ./files/lib/upgrade/keep.d/icwmp $(1)/lib/upgrade/keep.d/icwmp
 	$(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

icwmp/files/etc/icwmpd/uci_stuck_workaround.sh

@@ -1,12 +0,0 @@
-#!/bin/sh
-
-log()
-{
-        logger -t cwmp.hacks "$@"
-}
-
-timeout 2 uci -c /var/state show icwmp >/dev/null 2>&1
-if [ "$?" -eq "143" ]; then
-        log "Seems uci got stuck, restarting cwmp ...."
-        /etc/init.d/icwmpd restart
-fi

icwmp/files/etc/init.d/icwmpd

@@ -537,12 +537,6 @@ start_service() {
 		procd_append_param command -b
 	fi
 
-	# Add crontab job to check uci stuck
-	if ! grep -q "uci_stuck_workaround.sh" /etc/crontabs/root; then
-		echo "*/1 * * * *    /etc/icwmpd/uci_stuck_workaround.sh" >>/etc/crontabs/root
-		ubus call uci commit '{"config":"cron"}'
-	fi
-
 	procd_set_param respawn \
 		"${respawn_threshold:-5}" \
 		"${respawn_timeout:-10}" "${respawn_retry:-3}"

libwifi/Makefile

@@ -53,7 +53,7 @@ else ifeq ($(CONFIG_TARGET_ipq53xx),y)
   TARGET_CFLAGS +=-DIPQ53XX
 else ifeq ($(CONFIG_TARGET_mediatek),y)
   TARGET_PLATFORM=LINUX
-  TARGET_WIFI_TYPE=MEDIATEK MAC80211
+  TARGET_WIFI_TYPE=MAC80211
   TARGET_CFLAGS +=-DIOPSYS_LINUX
 else
   $(info Unexpected CONFIG_TARGET, use default MAC80211)

map-agent/Makefile

@@ -16,7 +16,7 @@ PKG_LICENSE_FILES:=LICENSE
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://dev.iopsys.eu/multi-ap/map-agent
+PKG_SOURCE_URL:=git@dev.iopsys.eu:multi-ap/map-agent.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip
 endif

map-agent/files/lib/multiap/map_genconfig

@@ -120,6 +120,7 @@ generate_multiap_config() {
 					uci set wireless.$secname.default_disabled="1"
 					uci set wireless.$secname.multi_ap="1"
 					uci commit wireless
+					wifi reload
 				else
 					ubus call uci set "{\"config\":\"wireless\",\"type\":\"wifi-iface\", \
 						\"match\":{\"mode\":\"sta\", \"ifname\":\"$ifname\", \"device\":\"$device\"},\"values\":{\"multi_ap\":\"1\"}}" 2>/dev/null

map-controller/Makefile

@@ -13,7 +13,7 @@ PKG_MAINTAINER:=Jakob Olsson <jakob.olsson@iopsys.eu>
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://dev.iopsys.eu/multi-ap/map-controller
+PKG_SOURCE_URL:=git@dev.iopsys.eu:multi-ap/map-controller.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip
 endif

self-diagnostics/files/usr/share/self-diagnostics/spec/config.json

@@ -6,7 +6,6 @@
 			"cmd": "cat /etc/os-release"
 		},
 		{
-			//build.config   build.feeds    build.version
 			"description": "Installed Packages",
 			"cmd": "opkg list-installed"
 		},
@@ -26,11 +25,5 @@
 			"description": "Firmware Environment",
 			"cmd": "fw_printenv"
 		}
-                {
-                        "description": "Kernel config",
-                        "cmd": "zcat /proc/config.gz"
-                }	]
+	]
 }
-// get u-boot version (actual one)
-// get u-boot version counter
-// device-tre

self-diagnostics/files/usr/share/self-diagnostics/spec/network.json

@@ -87,5 +87,3 @@
 		}
 	]
 }
-// ethtool
-// xdslctl

self-diagnostics/files/usr/share/self-diagnostics/spec/system.json

@@ -62,15 +62,6 @@
 			"dependency" : {
 				"file": "/usr/sbin/ubinfo"
 			}
-// lsusbi
-			// flash model and more statistics
-// gpio info
-// BCM: offloading stuff like fc status
-// BCM: phy cmd raw (Arne can provide the cmd)
-// BCM pinctrl debug
-//scratchpadctl list
-// airoha switch stuff from proc (piotr posted on teams)
-
 		}
 	]
 }

self-diagnostics/files/usr/share/self-diagnostics/spec/wifi.json

@@ -27,6 +27,5 @@
 			"description": "iwinfo interface details",
 			"cmd": "/usr/bin/iwinfo"
 		}
-		// nvram calibration settings (using nvram command)
 	]
 }