From: Vladislav Grigoryev <vg.aetera@gmail.com>
Date: Fri, 20 Aug 2021 04:07:47 +0000 (+0300)
Subject: bonding: use shorter interface prefix
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=4f4722e36f433eb83322238460ee8b72da879fb6;p=feed%2Fpackages.git

bonding: use shorter interface prefix

Change the interface protocol prefix from "bonding-" to "bond-".
This allows longer custom interface names and useful for VLANs.

Signed-off-by: Vladislav Grigoryev <vg.aetera@gmail.com>
---

diff --git a/net/bonding/Makefile b/net/bonding/Makefile
index d9bafe21c8..e511ba0ec4 100644
--- a/net/bonding/Makefile
+++ b/net/bonding/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=proto-bonding
 PKG_VERSION:=2021-04-09
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_LICENSE:=GPL-2.0
 PKG_LICENSE_FILES:=
diff --git a/net/bonding/files/lib/netifd/proto/bonding.sh b/net/bonding/files/lib/netifd/proto/bonding.sh
index 04cec109ce..43a1f77c57 100755
--- a/net/bonding/files/lib/netifd/proto/bonding.sh
+++ b/net/bonding/files/lib/netifd/proto/bonding.sh
@@ -90,7 +90,7 @@ proto_bonding_add_slave() {
 
 proto_bonding_setup() {
 	local cfg="$1"
-	local link="bonding-$cfg"
+	local link="bond-$cfg"
 
 	# Check for loaded kernel bonding driver (/sys/class/net/bonding_masters exists)
 	[ -f "$BONDING_MASTERS" ] || {
@@ -208,7 +208,7 @@ proto_bonding_setup() {
 
 proto_bonding_teardown() {
 	local cfg="$1"
-	local link="bonding-$cfg"
+	local link="bond-$cfg"
 
 	# Check for loaded kernel bonding driver (/sys/class/net/bonding_masters exists)
 	[ -f "$BONDING_MASTERS" ] || {