From a530b8d9818126e04207de619af8578a4ec4c590 Mon Sep 17 00:00:00 2001
From: Rodrigo Vaz <rodrigo.vaz@gmail.com>
Date: Fri, 13 Dec 2013 16:39:49 -0200
Subject: [PATCH] fix #3141 Bridge creation when ipv6 is not enabled

---
 network.go | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/network.go b/network.go
index a230356a7..3e5f63507 100644
--- a/network.go
+++ b/network.go
@@ -178,7 +178,11 @@ func CreateBridgeIface(config *DaemonConfig) error {
 func createBridgeIface(name string) error {
 	s, err := syscall.Socket(syscall.AF_INET6, syscall.SOCK_STREAM, syscall.IPPROTO_IP)
 	if err != nil {
-		return fmt.Errorf("Error creating bridge creation socket: %s", err)
+		utils.Debugf("Bridge socket creation failed IPv6 probably not enabled: %v", err)
+		s, err = syscall.Socket(syscall.AF_INET, syscall.SOCK_STREAM, syscall.IPPROTO_IP)
+		if err != nil {
+			return fmt.Errorf("Error creating bridge creation socket: %s", err)
+		}
 	}
 	defer syscall.Close(s)