rename the dummy interface name

murali-reddy · murali-reddy · commit 472b7b104018 · 2019-01-10T13:59:07.000+05:30
diff --git a/net/bridge.go b/net/bridge.go
@@ -334,10 +334,10 @@ func (b bridgeImpl) initPrep(config *BridgeConfig) error {
 		return errors.Wrap(err, "creating dummy interface")
 	}
 	defer func() {
-		var dummyIf netlink.Link
-		dummyIf, err = netlink.LinkByName(WeaveDummyIfName)
+		var dummy netlink.Link
+		dummy, err = netlink.LinkByName(WeaveDummyIfName)
 		if err == nil {
-			if err = netlink.LinkDel(dummyIf); err != nil {
+			if err = netlink.LinkDel(dummy); err != nil {
 				err = errors.Wrap(err, "deleting dummy interface")
 			}
 		}

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