From 8d63e73522096e5a5a9e3914f02f1666f757fa0b Mon Sep 17 00:00:00 2001 From: Michael Holzheu Date: Fri, 9 Sep 2016 17:51:30 +0200 Subject: [PATCH] Revert "add s390x arch build info at the netlink_deprecated_linux bridge driver" This reverts commit b042dbe3128333b2e0f1d1459f9a1c77a34c4f7c. The original commit breaks s390x, for example Docker build fails: * https://github.com/docker/docker/issues/26440 As discussed in the above issue: Even though char is unsigned by default on s390x, (gcc)go forces the type of RawSockaddr.Data to be signed. It makes no practical difference if these fields are signed or unsigned, it's just an API issue. The (assumed) reason for the original commit: For a while RawSockaddr.Data was unsigned during development of the gcc s390x port (not in an upstream release though). Probably the patch has been developed in this time frame. Signed-off-by: Michael Holzheu --- .../drivers/bridge/netlink_deprecated_linux_notarm.go | 2 +- .../drivers/bridge/netlink_deprecated_linux_s390x.go | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) delete mode 100644 libnetwork/drivers/bridge/netlink_deprecated_linux_s390x.go diff --git a/libnetwork/drivers/bridge/netlink_deprecated_linux_notarm.go b/libnetwork/drivers/bridge/netlink_deprecated_linux_notarm.go index 0852d0f165..df526952f7 100644 --- a/libnetwork/drivers/bridge/netlink_deprecated_linux_notarm.go +++ b/libnetwork/drivers/bridge/netlink_deprecated_linux_notarm.go @@ -1,4 +1,4 @@ -// +build !arm,!ppc64,!ppc64le,!s390x +// +build !arm,!ppc64,!ppc64le package bridge diff --git a/libnetwork/drivers/bridge/netlink_deprecated_linux_s390x.go b/libnetwork/drivers/bridge/netlink_deprecated_linux_s390x.go deleted file mode 100644 index 2d9abdc2ce..0000000000 --- a/libnetwork/drivers/bridge/netlink_deprecated_linux_s390x.go +++ /dev/null @@ -1,7 +0,0 @@ -// +build s390x - -package bridge - -func ifrDataByte(b byte) uint8 { - return uint8(b) -}