Skip to content
This repository was archived by the owner on Jun 20, 2024. It is now read-only.

Commit 126d2d8

Browse files
committed
addressing review comment. use defer right after link creation.
1 parent 66b05a4 commit 126d2d8

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

net/bridge.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -333,12 +333,6 @@ func (b bridgeImpl) initPrep(config *BridgeConfig) error {
333333
if err = LinkAddIfNotExist(dummy); err != nil {
334334
return errors.Wrap(err, "creating dummy interface")
335335
}
336-
if err := netlink.LinkSetMTU(dummy, config.MTU); err != nil {
337-
return errors.Wrapf(err, "setting dummy interface mtu to %d", config.MTU)
338-
}
339-
if err := netlink.LinkSetMasterByIndex(dummy, b.bridge.Attrs().Index); err != nil {
340-
return errors.Wrap(err, "setting dummy interface master")
341-
}
342336
defer func() {
343337
var dummyIf netlink.Link
344338
dummyIf, err = netlink.LinkByName(WeaveDummyIfName)
@@ -348,6 +342,12 @@ func (b bridgeImpl) initPrep(config *BridgeConfig) error {
348342
}
349343
}
350344
}()
345+
if err := netlink.LinkSetMTU(dummy, config.MTU); err != nil {
346+
return errors.Wrapf(err, "setting dummy interface mtu to %d", config.MTU)
347+
}
348+
if err := netlink.LinkSetMasterByIndex(dummy, b.bridge.Attrs().Index); err != nil {
349+
return errors.Wrap(err, "setting dummy interface master")
350+
}
351351
return err
352352
}
353353

0 commit comments

Comments
 (0)