From: Jo-Philipp Wich <jow@openwrt.org>
Date: Sat, 24 Sep 2011 03:31:00 +0000 (+0000)
Subject: libs/core: non-bridge handling fix in network model
X-Git-Tag: 0.11.0~1712
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=47f011b947f3416c64f2352ca988de6004f49e5f;p=project%2Fluci.git

libs/core: non-bridge handling fix in network model
---

diff --git a/libs/core/luasrc/model/network.lua b/libs/core/luasrc/model/network.lua
index 26344c2cc1..983483d82d 100644
--- a/libs/core/luasrc/model/network.lua
+++ b/libs/core/luasrc/model/network.lua
@@ -791,26 +791,23 @@ function network.get_interfaces(self)
 		ifaces[#ifaces+1] = nfs[ifn]
 	end
 
-	local num = { }
-	local wfs = { }
-	uci_r:foreach("wireless", "wifi-iface",
-		function(s)
-			if s.device then
-				num[s.device] = num[s.device] and num[s.device] + 1 or 1
-				if s.network == self.sid then
-					ifn = "%s.network%d" %{ s.device, num[s.device] }
-					wfs[ifn] = interface(ifn, self)
+	if self:is_bridge() then
+		local num = { }
+		local wfs = { }
+		uci_r:foreach("wireless", "wifi-iface",
+			function(s)
+				if s.device then
+					num[s.device] = num[s.device] and num[s.device] + 1 or 1
+					if s.network == self.sid then
+						ifn = "%s.network%d" %{ s.device, num[s.device] }
+						wfs[ifn] = interface(ifn, self)
+					end
 				end
-			end
-		end)
-
-	for ifn in utl.kspairs(wfs) do
-		ifaces[#ifaces+1] = wfs[ifn]
+			end)
 
-		-- only bridges may cover more than one interface
-		--if not self:is_bridge() then
-		--	break
-		--end
+		for ifn in utl.kspairs(wfs) do
+			ifaces[#ifaces+1] = wfs[ifn]
+		end
 	end
 
 	return ifaces