From: Jo-Philipp Wich <jow@openwrt.org>
Date: Tue, 11 Oct 2011 01:14:11 +0000 (+0000)
Subject: libs/core: more fixes for network model
X-Git-Tag: 0.11.0~1577
X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=commitdiff_plain;h=2c316a6aabb04d319637128d1c734817e48c8308

libs/core: more fixes for network model
---

diff --git a/libs/core/luasrc/model/network.lua b/libs/core/luasrc/model/network.lua
index 6e7a708ad..dd2bdfb90 100644
--- a/libs/core/luasrc/model/network.lua
+++ b/libs/core/luasrc/model/network.lua
@@ -773,7 +773,7 @@ function protocol.is_floating(self)
 end
 
 function protocol.is_empty(self)
-	if self:is_virtual() then
+	if self:is_floating() then
 		return false
 	else
 		local rv = true
@@ -837,12 +837,12 @@ function protocol.get_interface(self)
 	else
 		local ifn = nil
 		local num = { }
-		for ifn in utl.imatch(_uci_state:get("network", self.sid, "ifname")) do
+		for ifn in utl.imatch(_uci_real:get("network", self.sid, "ifname")) do
 			ifn = ifn:match("^[^:/]+")
 			return ifn and interface(ifn, self)
 		end
 		ifn = nil
-		_uci_state:foreach("wireless", "wifi-iface",
+		_uci_real:foreach("wireless", "wifi-iface",
 			function(s)
 				if s.device then
 					num[s.device] = num[s.device] and num[s.device] + 1 or 1