From 8d2cefd5a5c61727b67ca2831003da30c61896fa Mon Sep 17 00:00:00 2001 From: Sven Dowideit Date: Wed, 4 Mar 2015 13:24:17 -0800 Subject: [PATCH] Seems like an un-necessary if statement Signed-off-by: Sven Dowideit Upstream-commit: 4e5ea0c8755231dfffd7b82bc6551415b14ed0de Component: engine --- components/engine/daemon/networkdriver/bridge/driver.go | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/components/engine/daemon/networkdriver/bridge/driver.go b/components/engine/daemon/networkdriver/bridge/driver.go index bc17dbcd01..329052be41 100644 --- a/components/engine/daemon/networkdriver/bridge/driver.go +++ b/components/engine/daemon/networkdriver/bridge/driver.go @@ -508,11 +508,7 @@ func Allocate(job *engine.Job) engine.Status { globalIPv6 net.IP ) - if requestedIP != nil { - ip, err = ipallocator.RequestIP(bridgeIPv4Network, requestedIP) - } else { - ip, err = ipallocator.RequestIP(bridgeIPv4Network, nil) - } + ip, err = ipallocator.RequestIP(bridgeIPv4Network, requestedIP) if err != nil { return job.Error(err) }