p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #10321 from titanous/fix-err

Browse Source 
Fix missing err assignment in bridge creation
Upstream-commit: 30293e3fd0b03aa6bcd7b725fc2429e4cbeeb169
Component: engine
This commit is contained in:
Alexander Morozov
2015-01-23 15:07:23 -08:00
parent c2c9f5b572 cc1de71aa0
commit 9fa17b5deb
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/engine/daemon/networkdriver/bridge/driver.go
View File

@ -396,7 +396,7 @@ func configureBridge(bridgeIP string, bridgeIPv6 string, enableIPv6 bool) error
return err
}
if netlink.NetworkLinkAddIp(iface, ipAddr, ipNet); err != nil {
if err := netlink.NetworkLinkAddIp(iface, ipAddr, ipNet); err != nil {
return fmt.Errorf("Unable to add private network: %s", err)
}
@ -413,7 +413,7 @@ func configureBridge(bridgeIP string, bridgeIPv6 string, enableIPv6 bool) error
return err
}
if netlink.NetworkLinkAddIp(iface, ipAddr6, ipNet6); err != nil {
if err := netlink.NetworkLinkAddIp(iface, ipAddr6, ipNet6); err != nil {
return fmt.Errorf("Unable to add private IPv6 network: %s", err)
}
}