1. docker
  2. Commit d5c78a4c07929eda2d448f9b2a09fb3d65a75a2d
Browse code

Fix missing err assignment in bridge creation

Signed-off-by: Jonathan Rudenberg <jonathan@titanous.com>

Jonathan Rudenberg authored on 2015/01/24 07:32:36
Showing 1 changed files
daemon/networkdriver/bridge/driver.go
History View file @ d5c78a4
... ... 
@@ -396,7 +396,7 @@ func configureBridge(bridgeIP string, bridgeIPv6 string, enableIPv6 bool) error
396 396 
 		return err
397 397 
 	}
398 398
399 
-	if netlink.NetworkLinkAddIp(iface, ipAddr, ipNet); err != nil {
399 
+	if err := netlink.NetworkLinkAddIp(iface, ipAddr, ipNet); err != nil {
400 400 
 		return fmt.Errorf("Unable to add private network: %s", err)
401 401 
 	}
402 402
... ... 
@@ -413,7 +413,7 @@ func configureBridge(bridgeIP string, bridgeIPv6 string, enableIPv6 bool) error
413 413 
 			return err
414 414 
 		}
415 415
416 
-		if netlink.NetworkLinkAddIp(iface, ipAddr6, ipNet6); err != nil {
416 
+		if err := netlink.NetworkLinkAddIp(iface, ipAddr6, ipNet6); err != nil {
417 417 
 			return fmt.Errorf("Unable to add private IPv6 network: %s", err)
418 418 
 		}
419 419 
 	}