From cc1de71aa06805994414307cf067d0dd3bb615b0 Mon Sep 17 00:00:00 2001 From: Jonathan Rudenberg Date: Fri, 23 Jan 2015 14:32:36 -0800 Subject: [PATCH] Fix missing err assignment in bridge creation Signed-off-by: Jonathan Rudenberg Upstream-commit: d5c78a4c07929eda2d448f9b2a09fb3d65a75a2d Component: engine --- components/engine/daemon/networkdriver/bridge/driver.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/engine/daemon/networkdriver/bridge/driver.go b/components/engine/daemon/networkdriver/bridge/driver.go index 8e28a710f5..0d3f27517d 100644 --- a/components/engine/daemon/networkdriver/bridge/driver.go +++ b/components/engine/daemon/networkdriver/bridge/driver.go @@ -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) } }