qos: enable should be 1 by default

(cherry picked from commit 01819a7f72)

map-topology/Makefile

@@ -6,11 +6,11 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=map-topology
-PKG_VERSION:=2.5.1.13
+PKG_VERSION:=2.5.1.14
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
-PKG_SOURCE_VERSION:=aaa55a72e719184af32d57a9b40bec1c440774a9
+PKG_SOURCE_VERSION:=bacbffccabdc1a388a135daad58db4ca60676b05
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/map-topology.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz

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

@@ -182,9 +182,9 @@ hw_commit_all() {
 
     if [ "${glob_alg}" != "" ] ; then
         /userfs/bin/qosrule discpline $(hw_sc_alg2str ${glob_alg}) ${weight_list} \
-                            ${shape_rate:+uplink-bandwidth} $shape_rate \
+                            uplink-bandwidth ${shape_rate:-0} \
                             queuemask $queue_mask
     else
-        /userfs/bin/qosrule discpline off
+        /userfs/bin/qosrule discpline Enable 0
     fi
 }

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

@@ -5,9 +5,9 @@
 handle_classify() {
     cid="$1" #classify section ID
 
-    config_get is_enable "$cid" "enable"
+    config_get is_enable "$cid" "enable" 1
     # no need to configure disabled classify rules
-    if [ -z "$is_enable" ] || [ "$is_enable" == "0" ]; then
+    if [ "$is_enable" == "0" ]; then
         return
     fi
 

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

@@ -80,10 +80,10 @@ handle_policer() {
     local p_sec="$1" # policer section ID
     local dir=1 # default direction, upstream
 
-    config_get is_enable "$p_sec" "enable"
+    config_get is_enable "$p_sec" "enable" 1
 
     # No need to configure disabled policer
-    if [ -z "$is_enable" ] || [ "$is_enable" == "0" ] ; then
+    if [ "$is_enable" == "0" ] ; then
         return
     fi
 

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

@@ -18,10 +18,10 @@ handle_queue() {
     local qid="$1" #queue section ID
     local intf_name="$2"
 
-    config_get is_enable "$qid" "enable"
+    config_get is_enable "$qid" "enable" 1
 
     # no need to configure disabled queues
-    if [ -z "${is_enable}" ] || [ "${is_enable}" == "0" ]; then
+    if [ "${is_enable}" == "0" ]; then
         return
     fi
 

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

@@ -7,9 +7,9 @@
 handle_shaper() {
     sid="$1" #queue section ID
 
-    config_get is_enable "$sid" "enable"
+    config_get is_enable "$sid" "enable" 1
     # no need to configure disabled queues
-    if [ -z "${is_enable}" ] || [ "${is_enable}" == "0" ] ; then
+    if [ "${is_enable}" == "0" ] ; then
         return
     fi
 

ssdpd/files/etc/config/ssdpd

@@ -5,3 +5,5 @@ config ssdpd 'ssdp'
 	option socket_path '/var/run/minissdpd.sock'
 	option ttl '2'
 	option interface 'br-lan'
+	option debug '0'
+

ssdpd/files/etc/init.d/ssdpd

@@ -7,14 +7,14 @@ USE_PROCD=1
 PROG=/usr/sbin/ssdpd
 
 log() {
-	echo "${@}"|logger -t ssdp.init -p info
+	echo "${@}"|logger -t ssdpd.init -p info
 }
 
 validate_ssdpd_ssdp_section()
 {
 	uci_validate_section ssdpd ssdpd "ssdp" \
 		'enabled:bool:true' \
-		'debug:bool:0' \
+		'debug:bool:false' \
 		'ipv6_enabled:bool:false' \
 		'socket_path:string' \
 		'ttl:uinteger' \
@@ -35,16 +35,13 @@ configure_ssdp()
 	[ ${enabled} -eq 0 ] && return 0
 
 	procd_set_param command ${PROG}
+
 	if [ ${ipv6_enabled} -eq 1 ]; then
 		procd_append_param command -6
 	fi
 
 	if [ ${debug} -eq 1 ]; then
-		procd_set_param stdout 1
-		procd_set_param stderr 1
-	else
-		procd_set_param stdout 0
-		procd_set_param stderr 0
+		procd_append_param command -d
 	fi
 
 	if [ -n "${socket_path}" ]; then
@@ -57,7 +54,6 @@ configure_ssdp()
 
 	# If no interface is given defaults for br-lan
 	procd_append_param command -i ${interface:-br-lan}
-	procd_append_param command -d
 }
 
 start_service() {

ssdpd/patches/012-ubus-runner-thread-hook

@@ -14,8 +14,8 @@
  #endif
  
 +extern char *ssdp_sockpath;
-+extern void ssdpd_ubus_stop(void);
 +void upnp_thread_discover_devices(void);
++void ssdpd_ubus_stop(void);
 +
  /* current request management structure */
  struct reqelem {
@@ -72,16 +72,7 @@
  }
 --- a/minissdpd/ssdpd.c
 +++ b/minissdpd/ssdpd.c
-@@ -28,6 +28,8 @@
- 
- #include "codelength.h"
- 
-+void ssdpd_ubus_stop(void);
-+
- struct UPNPDev {
- 	struct list_head list;
- 	char *descURL;
-@@ -624,3 +626,8 @@ end:
+@@ -624,3 +624,8 @@ end:
  	uloop_done();
  	ubus_free(ctx);
  }
@@ -90,3 +81,15 @@
 +{
 +	uloop_end();
 +}
++
+--- a/minissdpd/config.h
++++ b/minissdpd/config.h
+@@ -32,7 +32,7 @@
+ 
+ /* When NO_BACKGROUND_NO_PIDFILE is defined, minissdpd does not go to
+  * background and does not create any pidfile */
+-/*#define NO_BACKGROUND_NO_PIDFILE*/
++#define NO_BACKGROUND_NO_PIDFILE
+ 
+ /* define HAVE_IP_MREQN to use struct ip_mreqn instead of struct ip_mreq
+  * for setsockopt(IP_MULTICAST_IF). Available with Linux 2.4+,