lordwelch/router7
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

netconfig: don’t try to add bridge to itself

Browse Source
This commit is contained in:
Michael Stapelberg 2021-06-12 22:24:38 +02:00
parent bfb94377f4
commit b88ddd41c3
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
internal/netconfig/netconfig.go
View File

@ -271,6 +271,11 @@ func applyBridges(cfg *InterfaceConfig) error {
if !interfaces[addr] { if !interfaces[addr] {
continue continue
} }
if attr.Name == bridge.Name {
// Don’t try to add the bridge to itself: the bridge will take
// the MAC address of the first interface.
continue
}
log.Printf("adding interface %s to bridge %s", attr.Name, bridge.Name) log.Printf("adding interface %s to bridge %s", attr.Name, bridge.Name)
if err := netlink.LinkSetMaster(l, bridgeLink); err != nil { if err := netlink.LinkSetMaster(l, bridgeLink); err != nil {
return fmt.Errorf("LinkSetMaster(%s): %v", attr.Name, err) return fmt.Errorf("LinkSetMaster(%s): %v", attr.Name, err)