From a505196cb5412b2245be3a2f89d4526a8f80be07 Mon Sep 17 00:00:00 2001
From: AmadeusGhost <42570690+AmadeusGhost@users.noreply.github.com>
Date: Sat, 17 Jul 2021 18:08:17 +0800
Subject: [PATCH] Revert "base-files: generate "device" UCI type section for
 bridge"

This reverts commit 0a4ff9909147c3d07156f69f6e99ad6759b040f0.
---
 package/base-files/files/bin/config_generate | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/package/base-files/files/bin/config_generate b/package/base-files/files/bin/config_generate
index 206ab0ab97..461b7ccfe4 100755
--- a/package/base-files/files/bin/config_generate
+++ b/package/base-files/files/bin/config_generate
@@ -109,26 +109,17 @@ generate_network() {
 		ports="$ifname"
 	}
 
-	[ -n "$ports" -a -z "$bridge" ] && {
-		uci -q batch <<-EOF
-			add network device
-			set network.@device[-1].name='br-$1'
-			set network.@device[-1].type='bridge'
-			set network.@device[-1].macaddr='$macaddr'
-		EOF
-		for port in $ports; do uci add_list network.@device[-1].ports="$port"; done
-		ifname=br-$1
-		type=
-		macaddr=""
+	[ -n "$ports" ] && {
+		type="bridge"
+		ifname="$ports"
 	}
 
 	[ -n "$bridge" ] && {
-		[ -z "$ports" ] && ports="$ifname"
 		if [ -z "$vlan" ]; then
 			bridge_vlan_id=$((bridge_vlan_id + 1))
 			vlan=$bridge_vlan_id
 		fi
-		generate_bridge_vlan $1 $bridge "$ports" $vlan
+		generate_bridge_vlan $1 $bridge "$ifname" $vlan
 		ifname=$bridge.$vlan
 		type=""
 	}