From 60bd944921f97c48f412e153cd2c4c185804d2f8 Mon Sep 17 00:00:00 2001 From: Madhu Venugopal Date: Thu, 10 Mar 2016 02:34:05 -0800 Subject: [PATCH] ipvlan slaves must inherit the mac-address from parent Signed-off-by: Madhu Venugopal --- libnetwork/drivers/ipvlan/ipvlan_endpoint.go | 7 ------- 1 file changed, 7 deletions(-) diff --git a/libnetwork/drivers/ipvlan/ipvlan_endpoint.go b/libnetwork/drivers/ipvlan/ipvlan_endpoint.go index 3071162621..c192408e2e 100644 --- a/libnetwork/drivers/ipvlan/ipvlan_endpoint.go +++ b/libnetwork/drivers/ipvlan/ipvlan_endpoint.go @@ -6,7 +6,6 @@ import ( "github.com/Sirupsen/logrus" "github.com/docker/libnetwork/driverapi" "github.com/docker/libnetwork/netlabel" - "github.com/docker/libnetwork/netutils" "github.com/docker/libnetwork/osl" "github.com/docker/libnetwork/types" "github.com/vishvananda/netlink" @@ -36,12 +35,6 @@ func (d *driver) CreateEndpoint(nid, eid string, ifInfo driverapi.InterfaceInfo, if ep.addr == nil { return fmt.Errorf("create endpoint was not passed an IP address") } - if ep.mac == nil { - ep.mac = netutils.GenerateMACFromIP(ep.addr.IP) - if err := ifInfo.SetMacAddress(ep.mac); err != nil { - return err - } - } // disallow port mapping -p if opt, ok := epOptions[netlabel.PortMap]; ok { if _, ok := opt.([]types.PortBinding); ok {