Merge pull request #1198 from jordimassaguerpla/add_s390x

add s390x arch build info at the netlink_deprecated_linux bridge driver
moby · Sep 2, 2016 · 2be973e · 2be973e
2 parents c88c1a2 + 8c72dab
commit 2be973e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/drivers/bridge/netlink_deprecated_linux_notarm.go b/drivers/bridge/netlink_deprecated_linux_notarm.go
@@ -1,4 +1,4 @@
-// +build !arm,!ppc64,!ppc64le
+// +build !arm,!ppc64,!ppc64le,!s390x
 
 package bridge
 

diff --git a/drivers/bridge/netlink_deprecated_linux_s390x.go b/drivers/bridge/netlink_deprecated_linux_s390x.go
@@ -0,0 +1,7 @@
+// +build s390x
+
+package bridge
+
+func ifrDataByte(b byte) uint8 {
+	return uint8(b)
+}