From 21ed154c79f0e21958e2a7945e4e69e5580fd23d Mon Sep 17 00:00:00 2001 From: Alessandro Boch Date: Fri, 24 Apr 2015 17:08:50 -0700 Subject: [PATCH] Rename setGatewayIP() in sandbox pkg - setGatewayIP() => programGateway() becsause it is causing confusion with setGateway() and setGatewayIPv6() Signed-off-by: Alessandro Boch --- libnetwork/sandbox/configure_linux.go | 2 +- libnetwork/sandbox/namespace_linux.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libnetwork/sandbox/configure_linux.go b/libnetwork/sandbox/configure_linux.go index f3682a2b78..14af20320f 100644 --- a/libnetwork/sandbox/configure_linux.go +++ b/libnetwork/sandbox/configure_linux.go @@ -29,7 +29,7 @@ func configureInterface(iface netlink.Link, settings *Interface) error { return nil } -func setGatewayIP(path string, gw net.IP) error { +func programGateway(path string, gw net.IP) error { runtime.LockOSThread() defer runtime.UnlockOSThread() diff --git a/libnetwork/sandbox/namespace_linux.go b/libnetwork/sandbox/namespace_linux.go index 76b0b5bf7a..22e318feed 100644 --- a/libnetwork/sandbox/namespace_linux.go +++ b/libnetwork/sandbox/namespace_linux.go @@ -130,7 +130,7 @@ func (n *networkNamespace) AddInterface(i *Interface) error { } func (n *networkNamespace) SetGateway(gw net.IP) error { - err := setGatewayIP(n.path, gw) + err := programGateway(n.path, gw) if err == nil { n.sinfo.Gateway = gw } @@ -143,7 +143,7 @@ func (n *networkNamespace) SetGatewayIPv6(gw net.IP) error { return nil } - err := setGatewayIP(n.path, gw) + err := programGateway(n.path, gw) if err == nil { n.sinfo.GatewayIPv6 = gw }