Merge pull request opencontainers#424 from runcom/fix-go-vet

LK4D4 · LK4D4 · commit decba54d788a · 2015-11-30T09:06:41.000-08:00
libcontainer: network_linux.go: fix go vet
diff --git a/libcontainer/network_linux.go b/libcontainer/network_linux.go
@@ -93,7 +93,7 @@ func (l *loopback) create(n *network, nspid int) error {
 }
 
 func (l *loopback) initialize(config *network) error {
-	return netlink.LinkSetUp(&netlink.Device{netlink.LinkAttrs{Name: "lo"}})
+	return netlink.LinkSetUp(&netlink.Device{LinkAttrs: netlink.LinkAttrs{Name: "lo"}})
 }
 
 func (l *loopback) attach(n *configs.Network) (err error) {
@@ -111,7 +111,7 @@ type veth struct {
 }
 
 func (v *veth) detach(n *configs.Network) (err error) {
-	return netlink.LinkSetMaster(&netlink.Device{netlink.LinkAttrs{Name: n.HostInterfaceName}}, nil)
+	return netlink.LinkSetMaster(&netlink.Device{LinkAttrs: netlink.LinkAttrs{Name: n.HostInterfaceName}}, nil)
 }
 
 // attach a container network interface to an external network

Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ func (l loopback) create(n network, nspid int) error {`
`93`	`93`	`}`
`94`	`94`
`95`	`95`	`func (l loopback) initialize(config network) error {`
`96`		`- return netlink.LinkSetUp(&netlink.Device{netlink.LinkAttrs{Name: "lo"}})`
	`96`	`+ return netlink.LinkSetUp(&netlink.Device{LinkAttrs: netlink.LinkAttrs{Name: "lo"}})`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`func (l loopback) attach(n configs.Network) (err error) {`
`@@ -111,7 +111,7 @@ type veth struct {`
`111`	`111`	`}`
`112`	`112`
`113`	`113`	`func (v veth) detach(n configs.Network) (err error) {`
`114`		`- return netlink.LinkSetMaster(&netlink.Device{netlink.LinkAttrs{Name: n.HostInterfaceName}}, nil)`
	`114`	`+ return netlink.LinkSetMaster(&netlink.Device{LinkAttrs: netlink.LinkAttrs{Name: n.HostInterfaceName}}, nil)`
`115`	`115`	`}`
`116`	`116`
`117`	`117`	`// attach a container network interface to an external network`