From: Jo-Philipp Wich <jow@openwrt.org>
Date: Mon, 15 Nov 2010 22:03:45 +0000 (+0000)
Subject: libs/core: network model fixes
X-Git-Tag: 0.10.0~484
X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=commitdiff_plain;h=b30437329760a0dc2a92a41172802986e499a148

libs/core: network model fixes
---

diff --git a/libs/core/luasrc/model/network.lua b/libs/core/luasrc/model/network.lua
index 7882c81a8..cc4200cb4 100644
--- a/libs/core/luasrc/model/network.lua
+++ b/libs/core/luasrc/model/network.lua
@@ -275,26 +275,14 @@ end
 function del_network(self, n)
 	local r = uci_r:delete("network", n)
 	if r then
-		uci_r:foreach("network", "alias",
-			function(s)
-				if s.interface == n then
-					uci_r:delete("network", s['.name'])
-				end
-			end)
+		uci_r:delete_all("network", "alias",
+			function(s) return (s.interface == n) end)
 
-		uci_r:foreach("network", "route",
-			function(s)
-				if s.interface == n then
-					uci_r:delete("network", s['.name'])
-				end
-			end)
+		uci_r:delete_all("network", "route",
+			function(s) return (s.interface == n) end)
 
-		uci_r:foreach("network", "route6",
-			function(s)
-				if s.interface == n then
-					uci_r:delete("network", s['.name'])
-				end
-			end)
+		uci_r:delete_all("network", "route6",
+			function(s) return (s.interface == n) end)
 
 		uci_r:foreach("wireless", "wifi-iface",
 			function(s)
@@ -302,8 +290,6 @@ function del_network(self, n)
 					uci_r:delete("wireless", s['.name'], "network")
 				end
 			end)
-
-		uci_r:delete("network", n)
 	end
 	return r
 end
@@ -990,7 +976,11 @@ function wifinet.name(self)
 end
 
 function wifinet.ifname(self)
-	return self.iwinfo.ifname or self.wdev
+	local ifname = self.iwinfo.ifname
+	if not ifname or ifname:match("^wifi%d") or ifname:match("^radio%d") then
+		ifname = self.wdev
+	end
+	return ifname
 end
 
 function wifinet.get_device(self)