From: Christian Marangi <ansuelsmth@gmail.com>
Date: Thu, 9 Nov 2023 14:11:50 +0000 (+0100)
Subject: base-files: generalize ucidef_set_network_device
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=da7ad229311e6c68b023550f383d932dfd62d13b;p=openwrt%2Fstaging%2Flinusw.git

base-files: generalize ucidef_set_network_device

Generalize ucidef_set_network_device functions to use a more generic
_ucidef_set_network_device_common that takes as args the option and the
value to apply instead of hardcoding.

This is to reduce duplicated code in preparation for addition of
additional option for board.d usage.

Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
---

diff --git a/package/base-files/files/lib/functions/uci-defaults.sh b/package/base-files/files/lib/functions/uci-defaults.sh
index 6f395ec24b..d40f4354ad 100644
--- a/package/base-files/files/lib/functions/uci-defaults.sh
+++ b/package/base-files/files/lib/functions/uci-defaults.sh
@@ -106,20 +106,20 @@ ucidef_set_bridge_mac() {
 	json_select ..
 }
 
-ucidef_set_network_device_mac() {
+_ucidef_set_network_device_common() {
 	json_select_object "network_device"
 	json_select_object "${1}"
-	json_add_string macaddr "${2}"
+	json_add_string "${2}" "${3}"
 	json_select ..
 	json_select ..
 }
 
+ucidef_set_network_device_mac() {
+	_ucidef_set_network_device_common $1 macaddr $2
+}
+
 ucidef_set_network_device_path() {
-	json_select_object "network_device"
-	json_select_object "$1"
-	json_add_string path "$2"
-	json_select ..
-	json_select ..
+	_ucidef_set_network_device_common $1 path $2
 }
 
 _ucidef_add_switch_port() {