diff --git a/libnetwork/endpoint_info.go b/libnetwork/endpoint_info.go index f0b2afd9a2..edc813aa90 100644 --- a/libnetwork/endpoint_info.go +++ b/libnetwork/endpoint_info.go @@ -203,23 +203,7 @@ func (ep *Endpoint) Info() EndpointInfo { func (ep *Endpoint) Iface() *EndpointInterface { ep.mu.Lock() defer ep.mu.Unlock() - - if ep.iface != nil { - return ep.iface - } - - return nil -} - -func (ep *Endpoint) Interface() driverapi.InterfaceInfo { - ep.mu.Lock() - defer ep.mu.Unlock() - - if ep.iface != nil { - return ep.iface - } - - return nil + return ep.iface } // SetMacAddress allows the driver to set the mac address to the endpoint interface diff --git a/libnetwork/network.go b/libnetwork/network.go index 586994bcc1..a0fd365a1f 100644 --- a/libnetwork/network.go +++ b/libnetwork/network.go @@ -1085,7 +1085,7 @@ func (n *Network) addEndpoint(ep *Endpoint) error { return fmt.Errorf("failed to add endpoint: %v", err) } - err = d.CreateEndpoint(n.id, ep.id, ep.Interface(), ep.generic) + err = d.CreateEndpoint(n.id, ep.id, ep.Iface(), ep.generic) if err != nil { return types.InternalErrorf("failed to create endpoint %s on network %s: %v", ep.Name(), n.Name(), err)