b9f61ef2ee
This reverts commit f090dd2d75.
Reason for revert: breaks packages bond-cni, golang-github-containernetworking-plugins
Bug: 2049083
Change-Id: I98356b4aa634cf5d27ca8ce6b79b4f6be5419a17
42 lines
1.0 KiB
Diff
42 lines
1.0 KiB
Diff
From 67a4711d09c6595c17f32470c15bf471c287777d Mon Sep 17 00:00:00 2001
|
|
From: Michael Munday <munday@ca.ibm.com>
|
|
Date: Tue, 17 Jan 2017 11:33:38 -0500
|
|
Subject: [PATCH 2/3] syscall: expose IfInfomsg.X__ifi_pad on s390x
|
|
|
|
Exposing this field on s390x improves compatibility with the other
|
|
linux architectures, all of which already expose it.
|
|
|
|
Fixes #18628 and updates #18632.
|
|
|
|
Change-Id: I08e8e1eb705f898cd8822f8bee0d61ce11d514b5
|
|
---
|
|
src/syscall/ztypes_linux_s390x.go | 12 ++++++------
|
|
1 file changed, 6 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/src/syscall/ztypes_linux_s390x.go b/src/syscall/ztypes_linux_s390x.go
|
|
index 91f5ceff20..59a8b1fccd 100644
|
|
--- a/src/syscall/ztypes_linux_s390x.go
|
|
+++ b/src/syscall/ztypes_linux_s390x.go
|
|
@@ -449,12 +449,12 @@ type RtAttr struct {
|
|
}
|
|
|
|
type IfInfomsg struct {
|
|
- Family uint8
|
|
- _ uint8
|
|
- Type uint16
|
|
- Index int32
|
|
- Flags uint32
|
|
- Change uint32
|
|
+ Family uint8
|
|
+ X__ifi_pad uint8
|
|
+ Type uint16
|
|
+ Index int32
|
|
+ Flags uint32
|
|
+ Change uint32
|
|
}
|
|
|
|
type IfAddrmsg struct {
|
|
--
|
|
2.26.2
|
|
|