From: Dmitry Smirnov <onlyjob@debian.org>
Date: Sun, 14 Jun 2020 20:12:29 +0000 (+0100)
Subject: fixes FTBFS
X-Git-Tag: archive/raspbian/18.09.1+dfsg1-7.1+rpi1+deb10u2^2~12
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=4b5df74652d07470d15665d22f4d0093742bfbb6;p=docker.io.git

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
---

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
 	}