From b1e0c6720ab5b00472923f946f9cd5d6dbd7c032 Mon Sep 17 00:00:00 2001 From: Dmitry Smirnov Date: Sun, 21 Feb 2021 17:18:35 +0000 Subject: [PATCH] fixes FTBFS Last-Update: 2018-06-12 Forwarded: not-needed Bug-Upstream: https://github.com/docker/libnetwork/issues/2110 cannot use &tv (type *syscall.Timeval) as type *unix.Timeval Gbp-Pq: Name netlink_syscall.patch --- libnetwork/drivers/overlay/ov_network.go | 3 ++- libnetwork/ipvs/ipvs.go | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/libnetwork/drivers/overlay/ov_network.go b/libnetwork/drivers/overlay/ov_network.go index cf32e459..d5fa5aec 100644 --- a/libnetwork/drivers/overlay/ov_network.go +++ b/libnetwork/drivers/overlay/ov_network.go @@ -27,6 +27,7 @@ import ( "github.com/vishvananda/netlink" "github.com/vishvananda/netlink/nl" "github.com/vishvananda/netns" + "golang.org/x/sys/unix" ) var ( @@ -760,7 +761,7 @@ func (n *network) initSandbox(restore bool) error { return } // set the receive timeout to not remain stuck on the RecvFrom if the fd gets closed - tv := syscall.NsecToTimeval(soTimeout.Nanoseconds()) + tv := unix.NsecToTimeval(soTimeout.Nanoseconds()) err = nlSock.SetReceiveTimeout(&tv) }) n.nlSocket = nlSock diff --git a/libnetwork/ipvs/ipvs.go b/libnetwork/ipvs/ipvs.go index effbb716..5d68e8e7 100644 --- a/libnetwork/ipvs/ipvs.go +++ b/libnetwork/ipvs/ipvs.go @@ -11,6 +11,7 @@ import ( "github.com/vishvananda/netlink/nl" "github.com/vishvananda/netns" + "golang.org/x/sys/unix" ) const ( @@ -90,11 +91,11 @@ func New(path string) (*Handle, error) { return nil, err } // Add operation timeout to avoid deadlocks - tv := syscall.NsecToTimeval(netlinkSendSocketTimeout.Nanoseconds()) + tv := unix.NsecToTimeval(netlinkSendSocketTimeout.Nanoseconds()) if err := sock.SetSendTimeout(&tv); err != nil { return nil, err } - tv = syscall.NsecToTimeval(netlinkRecvSocketsTimeout.Nanoseconds()) + tv = unix.NsecToTimeval(netlinkRecvSocketsTimeout.Nanoseconds()) if err := sock.SetReceiveTimeout(&tv); err != nil { return nil, err } -- 2.30.2