@@ -3,7 +3,7 @@

 # LIBNETWORK_COMMIT is used to build the docker-userland-proxy binary. When

 # updating the binary version, consider updating github.com/docker/libnetwork

 # in vendor.conf accordingly

-: ${LIBNETWORK_COMMIT:=71d4d82a5ce50453b1121d95544f0a2ae95bef9b} # bump_19.03 branch

+: ${LIBNETWORK_COMMIT:=153d0769a1181bf591a9637fd487a541ec7db1e6} # bump_19.03 branch

 install_proxy() {

 	case "$1" in

@@ -38,7 +38,7 @@ github.com/gofrs/flock                              7f43ea2e6a643ad441fc12d0ecc0

 # libnetwork

 # When updating, also update LIBNETWORK_COMMIT in hack/dockerfile/install/proxy.installer accordingly

-github.com/docker/libnetwork                        71d4d82a5ce50453b1121d95544f0a2ae95bef9b # bump_19.03 branch

+github.com/docker/libnetwork                        153d0769a1181bf591a9637fd487a541ec7db1e6 # bump_19.03 branch

 github.com/docker/go-events                         e31b211e4f1cd09aa76fe4ac244571fab96ae47f

 github.com/armon/go-radix                           e39d623f12e8e41c7b5529e9a9dd67a1e2261f80

 github.com/armon/go-metrics                         eb0af217e5e9747e41dd5303755356b62d28e3ec

@@ -679,6 +679,12 @@ func (d *driver) createNetwork(config *networkConfiguration) (err error) {

 	bridgeAlreadyExists := bridgeIface.exists()

 	if !bridgeAlreadyExists {

 		bridgeSetup.queueStep(setupDevice)

+		bridgeSetup.queueStep(setupDefaultSysctl)

+	}

+

+	// For the default bridge, set expected sysctls

+	if config.DefaultBridge {

+		bridgeSetup.queueStep(setupDefaultSysctl)

 	}

 	// Even if a bridge exists try to setup IPv4.

@@ -2,6 +2,9 @@ package bridge

 import (

 	"fmt"

+	"io/ioutil"

+	"os"

+	"path/filepath"

 	"github.com/docker/docker/pkg/parsers/kernel"

 	"github.com/docker/libnetwork/netutils"

@@ -49,6 +52,22 @@ func setupDevice(config *networkConfiguration, i *bridgeInterface) error {

 	return err

 }

+func setupDefaultSysctl(config *networkConfiguration, i *bridgeInterface) error {

+	// Disable IPv6 router advertisements originating on the bridge

+	sysPath := filepath.Join("/proc/sys/net/ipv6/conf/", config.BridgeName, "accept_ra")

+	if _, err := os.Stat(sysPath); err != nil {

+		logrus.

+			WithField("bridge", config.BridgeName).

+			WithField("syspath", sysPath).

+			Info("failed to read ipv6 net.ipv6.conf.<bridge>.accept_ra")

+		return nil

+	}

+	if err := ioutil.WriteFile(sysPath, []byte{'0', '\n'}, 0644); err != nil {

+		return fmt.Errorf("libnetwork: Unable to disable IPv6 router advertisement: %v", err)

+	}

+	return nil

+}

+

 // SetupDeviceUp ups the given bridge interface.

 func setupDeviceUp(config *networkConfiguration, i *bridgeInterface) error {

 	err := i.nlh.LinkSetUp(i.Link)