From: Felix Fietkau <nbd@nbd.name>
Date: Sun, 21 Nov 2021 12:46:41 +0000 (+0100)
Subject: qosify: add support for configuring overhead
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=e9610794fd978175702b715a17f7925915fd1479;p=openwrt%2Fstaging%2Fjow.git

qosify: add support for configuring overhead

Signed-off-by: Felix Fietkau <nbd@nbd.name>
---

diff --git a/package/network/config/qosify/files/qosify.conf b/package/network/config/qosify/files/qosify.conf
index 865a023390..ac3423a8d4 100644
--- a/package/network/config/qosify/files/qosify.conf
+++ b/package/network/config/qosify/files/qosify.conf
@@ -28,6 +28,7 @@ config interface wan
 	option disabled 1
 	option bandwidth_up 100mbit
 	option bandwidth_down 100mbit
+	option overhead_type none
 	# defaults:
 	option ingress 1
 	option egress 1
diff --git a/package/network/config/qosify/files/qosify.init b/package/network/config/qosify/files/qosify.init
index eca79e6024..f676d92a52 100644
--- a/package/network/config/qosify/files/qosify.init
+++ b/package/network/config/qosify/files/qosify.init
@@ -72,7 +72,46 @@ add_interface() {
 	add_option boolean autorate_ingress
 	add_option string ingress_options
 	add_option string egress_options
-	add_option string options
+
+	config_get user_options "$cfg" options
+
+	config_get otype "$cfg" overhead_type
+	options=
+	case "$otype" in
+		none);;
+		manual)
+			config_get overhead "$cfg" overhead
+			[ -n "$overhead" ] && append options "overhead $overhead"
+
+			config_get encap "$cfg" overhead_encap
+			[ -n "$encap" ] && append options "$encap"
+		;;
+		conservative|\
+		pppoa-vcmux|\
+		pppoa-llc|\
+		pppoe-vcmux|\
+		pppoe-llcsnap|\
+		bridged-vcmux|\
+		bridged-llcsnap|\
+		ipoa-vcmux|\
+		ipoa-llcsnap|\
+		pppoe-ptm|\
+		bridged-ptm|\
+		docsis|\
+		ethernet)
+			append options "$otype"
+		;;
+	esac
+
+	config_get mpu "$cfg" overhead_mpu
+	[ -n "$mpu" ] && append options "mpu $mpu"
+
+	config_get ovlan "$cfg" overhead_vlan
+	[ "${ovlan:-0}" -ge 2 ] && append options "ether-vlan"
+	[ "${ovlan:-0}" -ge 1 ] && append options "ether-vlan"
+
+	[ -n "$user_options" ] && append options "$user_options"
+	[ -n "$options" ] && json_add_string options "$options"
 
 	json_close_object
 }