Skip to content

Commit 25df08e

Browse files
committed
drivers/macvlan: skip kernel version check
All distros that are supported by Docker now have at least kernel version 3.10, so this check should no longer be needed. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
1 parent 39419c4 commit 25df08e

2 files changed

Lines changed: 2 additions & 13 deletions

File tree

drivers/macvlan/macvlan_network.go

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package macvlan
33
import (
44
"fmt"
55

6-
"github.com/docker/docker/pkg/parsers/kernel"
76
"github.com/docker/docker/pkg/stringid"
87
"github.com/docker/libnetwork/driverapi"
98
"github.com/docker/libnetwork/netlabel"
@@ -17,15 +16,7 @@ import (
1716
// CreateNetwork the network for the specified driver type
1817
func (d *driver) CreateNetwork(nid string, option map[string]interface{}, nInfo driverapi.NetworkInfo, ipV4Data, ipV6Data []driverapi.IPAMData) error {
1918
defer osl.InitOSContext()()
20-
kv, err := kernel.GetKernelVersion()
21-
if err != nil {
22-
return fmt.Errorf("failed to check kernel version for %s driver support: %v", macvlanType, err)
23-
}
24-
// ensure Kernel version is >= v3.9 for macvlan support
25-
if kv.Kernel < macvlanKernelVer || (kv.Kernel == macvlanKernelVer && kv.Major < macvlanMajorVer) {
26-
return fmt.Errorf("kernel version failed to meet the minimum macvlan kernel requirement of %d.%d, found %d.%d.%d",
27-
macvlanKernelVer, macvlanMajorVer, kv.Kernel, kv.Major, kv.Minor)
28-
}
19+
2920
// reject a null v4 network
3021
if len(ipV4Data) == 0 || ipV4Data[0].Pool.String() == "0.0.0.0/0" {
3122
return fmt.Errorf("ipv4 pool is empty")

drivers/macvlan/macvlan_setup.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,7 @@ import (
1111
)
1212

1313
const (
14-
dummyPrefix = "dm-" // macvlan prefix for dummy parent interface
15-
macvlanKernelVer = 3 // minimum macvlan kernel support
16-
macvlanMajorVer = 9 // minimum macvlan major kernel support
14+
dummyPrefix = "dm-" // macvlan prefix for dummy parent interface
1715
)
1816

1917
// Create the macvlan slave specifying the source name

0 commit comments

Comments
 (0)