reuse dummy netlink object to delete the interface

murali-reddy · murali-reddy · commit 7f85a017bbc7 · 2019-02-12T10:16:20.000+05:30
diff --git a/net/bridge.go b/net/bridge.go
@@ -335,11 +335,8 @@ func (b bridgeImpl) initPrep(config *BridgeConfig) error {
 		return errors.Wrap(err, "creating dummy interface")
 	}
 	defer func() {
-		dummy, err = netlink.LinkByName(WeaveDummyIfName)
-		if err == nil {
-			if err = netlink.LinkDel(dummy); err != nil {
-				err = errors.Wrap(err, "deleting dummy interface")
-			}
+		if err = netlink.LinkDel(dummy); err != nil {
+			err = errors.Wrap(err, "deleting dummy interface")
 		}
 	}()
 	if err := netlink.LinkSetMTU(dummy, config.MTU); err != nil {

Original file line number	Diff line number	Diff line change
`@@ -335,11 +335,8 @@ func (b bridgeImpl) initPrep(config *BridgeConfig) error {`
`335`	`335`	`return errors.Wrap(err, "creating dummy interface")`
`336`	`336`	`}`
`337`	`337`	`defer func() {`
`338`		`- dummy, err = netlink.LinkByName(WeaveDummyIfName)`
`339`		`- if err == nil {`
`340`		`- if err = netlink.LinkDel(dummy); err != nil {`
`341`		`- err = errors.Wrap(err, "deleting dummy interface")`
`342`		`- }`
	`338`	`+ if err = netlink.LinkDel(dummy); err != nil {`
	`339`	`+ err = errors.Wrap(err, "deleting dummy interface")`
`343`	`340`	`}`
`344`	`341`	`}()`
`345`	`342`	`if err := netlink.LinkSetMTU(dummy, config.MTU); err != nil {`