From: Findlay Feng <redacted>
Date: Tue, 27 Feb 2024 07:34:24 +0000 (+0800)
Subject: proto-bonding: Modify ipaddr as optional
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=7da6cb31d1264679e50a3a7c846bfe6a01e1eb7e;p=openwrt-packages.git

proto-bonding: Modify ipaddr as optional

The configuration of ipaddr in proto-bonding is not necessary,
such as adding the bond interface to the bridge or
performing pppoe dialing on the bond interface, etc.

Signed-off-by: Findlay Feng <redacted>
---

diff --git a/net/bonding/files/lib/netifd/proto/bonding.sh b/net/bonding/files/lib/netifd/proto/bonding.sh
index 43a1f77c5..f785a8c22 100755
--- a/net/bonding/files/lib/netifd/proto/bonding.sh
+++ b/net/bonding/files/lib/netifd/proto/bonding.sh
@@ -193,15 +193,8 @@ proto_bonding_setup() {
 
 	proto_init_update "$link" 1
 
-	# For static configuration we _MUST_ have an IP address
-	[ -z "$ipaddr" ] && {
-		echo "$cfg" "No local IP address defined"
-		proto_notify_error "$cfg" INVALID_LOCAL_ADDRESS
-		proto_block_restart "$cfg"
-		return
-	}
-
-	proto_add_ipv4_address "$ipaddr" "$netmask"
+	# If ipaddr is configured, configure the ip to the interface
+	[ -n "$ipaddr" ] && proto_add_ipv4_address "$ipaddr" "$netmask"
 
 	proto_send_update "$cfg"
 }