docker/netlink_gcc_go.patch
2016-02-09 11:46:03 +00:00

49 lines
1.9 KiB
Diff

diff --git a/vendor/src/github.com/vishvananda/netlink/link_linux.go b/vendor/src/github.com/vishvananda/netlink/link_linux.go
index 3aa9124..6ad7c2b 100644
--- a/vendor/src/github.com/vishvananda/netlink/link_linux.go
+++ b/vendor/src/github.com/vishvananda/netlink/link_linux.go
@@ -415,11 +415,11 @@ func LinkAdd(link Link) error {
req.Flags |= syscall.IFF_TUN_EXCL
copy(req.Name[:15], base.Name)
req.Flags |= uint16(tuntap.Mode)
- _, _, errno := syscall.Syscall(syscall.SYS_IOCTL, file.Fd(), uintptr(syscall.TUNSETIFF), uintptr(unsafe.Pointer(&req)))
+ _, _, errno := syscall.Syscall(syscall.SYS_IOCTL, file.Fd(), uintptr(syscall_TUNSETIFF), uintptr(unsafe.Pointer(&req)))
if errno != 0 {
return fmt.Errorf("Tuntap IOCTL TUNSETIFF failed, errno %v", errno)
}
- _, _, errno = syscall.Syscall(syscall.SYS_IOCTL, file.Fd(), uintptr(syscall.TUNSETPERSIST), 1)
+ _, _, errno = syscall.Syscall(syscall.SYS_IOCTL, file.Fd(), uintptr(syscall_TUNSETPERSIST), 1)
if errno != 0 {
return fmt.Errorf("Tuntap IOCTL TUNSETPERSIST failed, errno %v", errno)
}
diff --git a/vendor/src/github.com/vishvananda/netlink/link_linux_others.go b/vendor/src/github.com/vishvananda/netlink/link_linux_others.go
new file mode 100644
index 0000000..feb6070
--- /dev/null
+++ b/vendor/src/github.com/vishvananda/netlink/link_linux_others.go
@@ -0,0 +1,9 @@
+// +build linux
+// +build x86_64 arm64 s390x
+
+package netlink
+
+const (
+ syscall_TUNSETIFF = 0x400454ca
+ syscall_TUNSETPERSIST = 0x400454ca
+)
diff --git a/vendor/src/github.com/vishvananda/netlink/link_linux_ppc64le.go b/vendor/src/github.com/vishvananda/netlink/link_linux_ppc64le.go
new file mode 100644
index 0000000..fac7c06
--- /dev/null
+++ b/vendor/src/github.com/vishvananda/netlink/link_linux_ppc64le.go
@@ -0,0 +1,9 @@
+// +build linux
+// +build ppc64le
+
+package netlink
+
+const (
+ syscall_TUNSETIFF = 0x800454ca
+ syscall_TUNSETPERSIST = 0x800454ca
+)