Parcourir la source

Merge pull request #10321 from titanous/fix-err

Fix missing err assignment in bridge creation
Alexander Morozov il y a 10 ans
Parent
commit
30293e3fd0
1 fichiers modifiés avec 2 ajouts et 2 suppressions
  1. 2 2
      daemon/networkdriver/bridge/driver.go

+ 2 - 2
daemon/networkdriver/bridge/driver.go

@@ -396,7 +396,7 @@ func configureBridge(bridgeIP string, bridgeIPv6 string, enableIPv6 bool) error
 		return err
 		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)
 		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
 			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)
 			return fmt.Errorf("Unable to add private IPv6 network: %s", err)
 		}
 		}
 	}
 	}