From 2fd97c1dd947cdff3950c2820c0ee2b49fa7c0c8 Mon Sep 17 00:00:00 2001 From: Alessandro Boch Date: Wed, 29 Jul 2015 17:23:55 -0700 Subject: [PATCH] Incorrect kernel version check in bridge - Kernel version check logic was wrong Signed-off-by: Alessandro Boch --- drivers/bridge/setup_device.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/bridge/setup_device.go b/drivers/bridge/setup_device.go index 96eeee5..f58be98 100644 --- a/drivers/bridge/setup_device.go +++ b/drivers/bridge/setup_device.go @@ -1,6 +1,7 @@ package bridge import ( + "github.com/Sirupsen/logrus" "github.com/docker/docker/pkg/parsers/kernel" "github.com/vishvananda/netlink" ) @@ -25,8 +26,10 @@ func setupDevice(config *networkConfiguration, i *bridgeInterface) error { // Only set the bridge's MAC address if the kernel version is > 3.3, as it // was not supported before that. kv, err := kernel.GetKernelVersion() - if err == nil && (kv.Kernel >= 3 && kv.Major >= 3) { - setMac = true + if err != nil { + logrus.Errorf("Failed to check kernel versions: %v. Will not assign a MAC address to the bridge interface", err) + } else { + setMac = kv.Kernel > 3 || (kv.Kernel == 3 && kv.Major >= 3) } return ioctlCreateBridge(config.BridgeName, setMac)