libs/core: Fix wireless network ids

diff --git a/libs/core/luasrc/model/wireless.lua b/libs/core/luasrc/model/wireless.lua
index 6c6467f..3d4b2b0 100644 (file)
--- a/libs/core/luasrc/model/wireless.lua
+++ b/libs/core/luasrc/model/wireless.lua
@@ -232,12 +232,6 @@ network:property("network")
 function network._init(self, sid)
        local count = 0
 
 function network._init(self, sid)
        local count = 0
 

-       ub.uci:foreach("wireless", "wifi-iface",
-               function(s)
-                       count = count + 1
-                       return s['.name'] ~= sid
-               end)
-

        local parent_dev = st:get("wireless", sid, "device")
                or ub.uci:get("wireless", sid, "device")
 
        local parent_dev = st:get("wireless", sid, "device")
                or ub.uci:get("wireless", sid, "device")
 


@@ -245,13 +239,19 @@ function network._init(self, sid)
                or parent_dev
 
        if dev then
                or parent_dev
 
        if dev then

-               self.id = "%s.network%d" %{ parent_dev, count }
-
-               local wtype = iwi.type(dev)
-               if dev and wtype then
-                       self.winfo = iwi[wtype]
-                       self.wdev  = dev
-               end
+               ub.uci:foreach("wireless", "wifi-iface",
+                       function(s)
+                               count = count + 1
+                               if s['.name'] == sid then
+                                       self.id = "%s.network%d" %{ parent_dev, count }
+
+                                       local wtype = iwi.type(dev)
+                                       if dev and wtype then
+                                               self.winfo = iwi[wtype]
+                                               self.wdev  = dev
+                                       end
+                               end
+                       end)

        end
 end
 
        end
 end