From fa9618550a946d94e43dd00baa0e1e01e5a1ea76 Mon Sep 17 00:00:00 2001
From: Alessandro Boch <aboch@docker.com>
Date: Wed, 14 Dec 2016 09:27:56 -0800
Subject: [PATCH] Fix buildIpamResources()

- Can no longer assume IPv6 operational data to be present

Signed-off-by: Alessandro Boch <aboch@docker.com>
---
 api/server/router/network/network_routes.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/api/server/router/network/network_routes.go b/api/server/router/network/network_routes.go
index 39b45e58bc..5e4f68a277 100644
--- a/api/server/router/network/network_routes.go
+++ b/api/server/router/network/network_routes.go
@@ -259,6 +259,9 @@ func buildIpamResources(r *types.NetworkResource, nwInfo libnetwork.NetworkInfo)
 
 	if !hasIpv6Conf {
 		for _, ip6Info := range ipv6Info {
+			if ip6Info.IPAMData.Pool == nil {
+				continue
+			}
 			iData := network.IPAMConfig{}
 			iData.Subnet = ip6Info.IPAMData.Pool.String()
 			iData.Gateway = ip6Info.IPAMData.Gateway.String()