Merge pull request #1951 from tano-systems/luci-base-network-fix

luci-base: network.lua: bridge information request functions fixes

diff --git a/modules/luci-compat/luasrc/model/network.lua b/modules/luci-compat/luasrc/model/network.lua
index 1a27b96f915a5a67e5c4ec82c74b4a5741418ad2..d717c52db5bb336dad20be3b9cef3bd87e392b08 100644 (file)
--- a/modules/luci-compat/luasrc/model/network.lua
+++ b/modules/luci-compat/luasrc/model/network.lua
@@ -371,6 +371,7 @@ function init(cursor)
                                        b.ifnames[1].bridge = b
                                end
                                _bridge[r[1]] = b
+                               _interfaces[r[1]].bridge = b
                        elseif b then
                                b.ifnames[#b.ifnames+1] = _interfaces[r[2]]
                                b.ifnames[#b.ifnames].bridge = b
@@ -1447,20 +1448,21 @@ function interface.ports(self)
                for _, iface in ipairs(members) do
                        ifaces[#ifaces+1] = interface(iface)
                end
+               return ifaces
        end
 end
 
 function interface.bridge_id(self)
-       if self.br then
-               return self.br.id
+       if self.dev and self.dev.bridge then
+               return self.dev.bridge.id
        else
                return nil
        end
 end
 
 function interface.bridge_stp(self)
-       if self.br then
-               return self.br.stp
+       if self.dev and self.dev.bridge then
+               return self.dev.bridge.stp
        else
                return false
        end
@@ -1479,7 +1481,8 @@ function interface.is_bridge(self)
 end
 
 function interface.is_bridgeport(self)
-       return self.dev and self.dev.bridge and true or false
+       return self.dev and self.dev.bridge and
+              (self.dev.bridge.name != self:name()) and true or false
 end
 
 function interface.tx_bytes(self)