From c40da18cc303e26bac17f4fea1a4263661dd829e Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Mon, 20 Jan 2020 10:29:45 +0100 Subject: sys/linux: fix IFLA_BR_GROUP_ADDR type --- sys/linux/gen/386.go | 9 +++++---- sys/linux/gen/amd64.go | 9 +++++---- sys/linux/gen/arm.go | 9 +++++---- sys/linux/gen/arm64.go | 9 +++++---- sys/linux/gen/mips64le.go | 9 +++++---- sys/linux/gen/ppc64le.go | 9 +++++---- sys/linux/socket_netlink_route.txt | 2 +- 7 files changed, 31 insertions(+), 25 deletions(-) (limited to 'sys/linux') diff --git a/sys/linux/gen/386.go b/sys/linux/gen/386.go index 039c37be1..55c752978 100644 --- a/sys/linux/gen/386.go +++ b/sys/linux/gen/386.go @@ -1490,7 +1490,7 @@ var structDescs_386 = []*KeyedStruct{ &StructType{Key: StructKey{Name: "nlattr_t[const[IFLA_BR_VLAN_FILTERING, int16], int8]"}, FldName: "IFLA_BR_VLAN_FILTERING"}, &StructType{Key: StructKey{Name: "nlattr_t[const[IFLA_BR_VLAN_PROTOCOL, int16], int32]"}, FldName: "IFLA_BR_VLAN_PROTOCOL"}, &StructType{Key: StructKey{Name: "nlattr_t[const[IFLA_BR_GROUP_FWD_MASK, int16], int32]"}, FldName: "IFLA_BR_GROUP_FWD_MASK"}, - &StructType{Key: StructKey{Name: "nlattr_t[const[IFLA_BR_GROUP_ADDR, int16], int32]"}, FldName: "IFLA_BR_GROUP_ADDR"}, + &StructType{Key: StructKey{Name: "nlattr_t[const[IFLA_BR_GROUP_ADDR, int16], mac_addr]"}, FldName: "IFLA_BR_GROUP_ADDR"}, &StructType{Key: StructKey{Name: "nlattr_t[const[IFLA_BR_MCAST_ROUTER, int16], int32]"}, FldName: "IFLA_BR_MCAST_ROUTER"}, &StructType{Key: StructKey{Name: "nlattr_t[const[IFLA_BR_MCAST_SNOOPING, int16], int32]"}, FldName: "IFLA_BR_MCAST_SNOOPING"}, &StructType{Key: StructKey{Name: "nlattr_t[const[IFLA_BR_MCAST_QUERY_USE_IFADDR, int16], int32]"}, FldName: "IFLA_BR_MCAST_QUERY_USE_IFADDR"}, @@ -21922,11 +21922,12 @@ var structDescs_386 = []*KeyedStruct{ &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "payload", TypeSize: 4}}, Kind: 1, RangeBegin: 2, RangeEnd: 30}, &BufferType{TypeCommon: TypeCommon{TypeName: "void", FldName: "size"}, Kind: 1}, }, AlignAttr: 4}}, - {Key: StructKey{Name: "nlattr_t[const[IFLA_BR_GROUP_ADDR, int16], int32]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[IFLA_BR_GROUP_ADDR, int16], int32]", TypeSize: 8}, Fields: []Type{ + {Key: StructKey{Name: "nlattr_t[const[IFLA_BR_GROUP_ADDR, int16], mac_addr]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[IFLA_BR_GROUP_ADDR, int16], mac_addr]", TypeSize: 12}, Fields: []Type{ &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "offsetof", FldName: "nla_len", TypeSize: 2}}, BitSize: 8, Offset: true, Path: []string{"size"}}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 20}, - &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "payload", TypeSize: 4}}}, + &UnionType{Key: StructKey{Name: "mac_addr"}, FldName: "payload"}, &BufferType{TypeCommon: TypeCommon{TypeName: "void", FldName: "size"}, Kind: 1}, + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 2}}, IsPad: true}, }, AlignAttr: 4}}, {Key: StructKey{Name: "nlattr_t[const[IFLA_BR_GROUP_FWD_MASK, int16], int32]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[IFLA_BR_GROUP_FWD_MASK, int16], int32]", TypeSize: 8}, Fields: []Type{ &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "offsetof", FldName: "nla_len", TypeSize: 2}}, BitSize: 8, Offset: true, Path: []string{"size"}}, @@ -73973,4 +73974,4 @@ var consts_386 = []ConstValue{ {Name: "bpf_insn_load_imm_dw", Value: 24}, } -const revision_386 = "7a16ee061356e36ab4a909ca3e22a83201947747" +const revision_386 = "ff83a44847760c04ac565cd63463c62561c05399" diff --git a/sys/linux/gen/amd64.go b/sys/linux/gen/amd64.go index 71da46b6c..6a80e4870 100644 --- a/sys/linux/gen/amd64.go +++ b/sys/linux/gen/amd64.go @@ -1506,7 +1506,7 @@ var structDescs_amd64 = []*KeyedStruct{ &StructType{Key: StructKey{Name: "nlattr_t[const[IFLA_BR_VLAN_FILTERING, int16], int8]"}, FldName: "IFLA_BR_VLAN_FILTERING"}, &StructType{Key: StructKey{Name: "nlattr_t[const[IFLA_BR_VLAN_PROTOCOL, int16], int32]"}, FldName: "IFLA_BR_VLAN_PROTOCOL"}, &StructType{Key: StructKey{Name: "nlattr_t[const[IFLA_BR_GROUP_FWD_MASK, int16], int32]"}, FldName: "IFLA_BR_GROUP_FWD_MASK"}, - &StructType{Key: StructKey{Name: "nlattr_t[const[IFLA_BR_GROUP_ADDR, int16], int32]"}, FldName: "IFLA_BR_GROUP_ADDR"}, + &StructType{Key: StructKey{Name: "nlattr_t[const[IFLA_BR_GROUP_ADDR, int16], mac_addr]"}, FldName: "IFLA_BR_GROUP_ADDR"}, &StructType{Key: StructKey{Name: "nlattr_t[const[IFLA_BR_MCAST_ROUTER, int16], int32]"}, FldName: "IFLA_BR_MCAST_ROUTER"}, &StructType{Key: StructKey{Name: "nlattr_t[const[IFLA_BR_MCAST_SNOOPING, int16], int32]"}, FldName: "IFLA_BR_MCAST_SNOOPING"}, &StructType{Key: StructKey{Name: "nlattr_t[const[IFLA_BR_MCAST_QUERY_USE_IFADDR, int16], int32]"}, FldName: "IFLA_BR_MCAST_QUERY_USE_IFADDR"}, @@ -22579,11 +22579,12 @@ var structDescs_amd64 = []*KeyedStruct{ &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "payload", TypeSize: 4}}, Kind: 1, RangeBegin: 2, RangeEnd: 30}, &BufferType{TypeCommon: TypeCommon{TypeName: "void", FldName: "size"}, Kind: 1}, }, AlignAttr: 4}}, - {Key: StructKey{Name: "nlattr_t[const[IFLA_BR_GROUP_ADDR, int16], int32]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[IFLA_BR_GROUP_ADDR, int16], int32]", TypeSize: 8}, Fields: []Type{ + {Key: StructKey{Name: "nlattr_t[const[IFLA_BR_GROUP_ADDR, int16], mac_addr]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[IFLA_BR_GROUP_ADDR, int16], mac_addr]", TypeSize: 12}, Fields: []Type{ &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "offsetof", FldName: "nla_len", TypeSize: 2}}, BitSize: 8, Offset: true, Path: []string{"size"}}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 20}, - &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "payload", TypeSize: 4}}}, + &UnionType{Key: StructKey{Name: "mac_addr"}, FldName: "payload"}, &BufferType{TypeCommon: TypeCommon{TypeName: "void", FldName: "size"}, Kind: 1}, + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 2}}, IsPad: true}, }, AlignAttr: 4}}, {Key: StructKey{Name: "nlattr_t[const[IFLA_BR_GROUP_FWD_MASK, int16], int32]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[IFLA_BR_GROUP_FWD_MASK, int16], int32]", TypeSize: 8}, Fields: []Type{ &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "offsetof", FldName: "nla_len", TypeSize: 2}}, BitSize: 8, Offset: true, Path: []string{"size"}}, @@ -74914,4 +74915,4 @@ var consts_amd64 = []ConstValue{ {Name: "bpf_insn_load_imm_dw", Value: 24}, } -const revision_amd64 = "2587f9c675f532d274dad4baaa6e6f1ffe998217" +const revision_amd64 = "d6ba1d23655a79edee2f656b71459b9616ba4707" diff --git a/sys/linux/gen/arm.go b/sys/linux/gen/arm.go index 5c69aeceb..107a68648 100644 --- a/sys/linux/gen/arm.go +++ b/sys/linux/gen/arm.go @@ -1502,7 +1502,7 @@ var structDescs_arm = []*KeyedStruct{ &StructType{Key: StructKey{Name: "nlattr_t[const[IFLA_BR_VLAN_FILTERING, int16], int8]"}, FldName: "IFLA_BR_VLAN_FILTERING"}, &StructType{Key: StructKey{Name: "nlattr_t[const[IFLA_BR_VLAN_PROTOCOL, int16], int32]"}, FldName: "IFLA_BR_VLAN_PROTOCOL"}, &StructType{Key: StructKey{Name: "nlattr_t[const[IFLA_BR_GROUP_FWD_MASK, int16], int32]"}, FldName: "IFLA_BR_GROUP_FWD_MASK"}, - &StructType{Key: StructKey{Name: "nlattr_t[const[IFLA_BR_GROUP_ADDR, int16], int32]"}, FldName: "IFLA_BR_GROUP_ADDR"}, + &StructType{Key: StructKey{Name: "nlattr_t[const[IFLA_BR_GROUP_ADDR, int16], mac_addr]"}, FldName: "IFLA_BR_GROUP_ADDR"}, &StructType{Key: StructKey{Name: "nlattr_t[const[IFLA_BR_MCAST_ROUTER, int16], int32]"}, FldName: "IFLA_BR_MCAST_ROUTER"}, &StructType{Key: StructKey{Name: "nlattr_t[const[IFLA_BR_MCAST_SNOOPING, int16], int32]"}, FldName: "IFLA_BR_MCAST_SNOOPING"}, &StructType{Key: StructKey{Name: "nlattr_t[const[IFLA_BR_MCAST_QUERY_USE_IFADDR, int16], int32]"}, FldName: "IFLA_BR_MCAST_QUERY_USE_IFADDR"}, @@ -21780,11 +21780,12 @@ var structDescs_arm = []*KeyedStruct{ &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "payload", TypeSize: 4}}, Kind: 1, RangeBegin: 2, RangeEnd: 30}, &BufferType{TypeCommon: TypeCommon{TypeName: "void", FldName: "size"}, Kind: 1}, }, AlignAttr: 4}}, - {Key: StructKey{Name: "nlattr_t[const[IFLA_BR_GROUP_ADDR, int16], int32]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[IFLA_BR_GROUP_ADDR, int16], int32]", TypeSize: 8}, Fields: []Type{ + {Key: StructKey{Name: "nlattr_t[const[IFLA_BR_GROUP_ADDR, int16], mac_addr]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[IFLA_BR_GROUP_ADDR, int16], mac_addr]", TypeSize: 12}, Fields: []Type{ &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "offsetof", FldName: "nla_len", TypeSize: 2}}, BitSize: 8, Offset: true, Path: []string{"size"}}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 20}, - &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "payload", TypeSize: 4}}}, + &UnionType{Key: StructKey{Name: "mac_addr"}, FldName: "payload"}, &BufferType{TypeCommon: TypeCommon{TypeName: "void", FldName: "size"}, Kind: 1}, + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 2}}, IsPad: true}, }, AlignAttr: 4}}, {Key: StructKey{Name: "nlattr_t[const[IFLA_BR_GROUP_FWD_MASK, int16], int32]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[IFLA_BR_GROUP_FWD_MASK, int16], int32]", TypeSize: 8}, Fields: []Type{ &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "offsetof", FldName: "nla_len", TypeSize: 2}}, BitSize: 8, Offset: true, Path: []string{"size"}}, @@ -73622,4 +73623,4 @@ var consts_arm = []ConstValue{ {Name: "bpf_insn_load_imm_dw", Value: 24}, } -const revision_arm = "f6a28f6aeb66e89aeaeb3e5a1175107244cf80f6" +const revision_arm = "eb211ffdddcdc0e167921fcb5dbdb89eb0611921" diff --git a/sys/linux/gen/arm64.go b/sys/linux/gen/arm64.go index a30a24e40..0fd81f21f 100644 --- a/sys/linux/gen/arm64.go +++ b/sys/linux/gen/arm64.go @@ -1506,7 +1506,7 @@ var structDescs_arm64 = []*KeyedStruct{ &StructType{Key: StructKey{Name: "nlattr_t[const[IFLA_BR_VLAN_FILTERING, int16], int8]"}, FldName: "IFLA_BR_VLAN_FILTERING"}, &StructType{Key: StructKey{Name: "nlattr_t[const[IFLA_BR_VLAN_PROTOCOL, int16], int32]"}, FldName: "IFLA_BR_VLAN_PROTOCOL"}, &StructType{Key: StructKey{Name: "nlattr_t[const[IFLA_BR_GROUP_FWD_MASK, int16], int32]"}, FldName: "IFLA_BR_GROUP_FWD_MASK"}, - &StructType{Key: StructKey{Name: "nlattr_t[const[IFLA_BR_GROUP_ADDR, int16], int32]"}, FldName: "IFLA_BR_GROUP_ADDR"}, + &StructType{Key: StructKey{Name: "nlattr_t[const[IFLA_BR_GROUP_ADDR, int16], mac_addr]"}, FldName: "IFLA_BR_GROUP_ADDR"}, &StructType{Key: StructKey{Name: "nlattr_t[const[IFLA_BR_MCAST_ROUTER, int16], int32]"}, FldName: "IFLA_BR_MCAST_ROUTER"}, &StructType{Key: StructKey{Name: "nlattr_t[const[IFLA_BR_MCAST_SNOOPING, int16], int32]"}, FldName: "IFLA_BR_MCAST_SNOOPING"}, &StructType{Key: StructKey{Name: "nlattr_t[const[IFLA_BR_MCAST_QUERY_USE_IFADDR, int16], int32]"}, FldName: "IFLA_BR_MCAST_QUERY_USE_IFADDR"}, @@ -22388,11 +22388,12 @@ var structDescs_arm64 = []*KeyedStruct{ &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "payload", TypeSize: 4}}, Kind: 1, RangeBegin: 2, RangeEnd: 30}, &BufferType{TypeCommon: TypeCommon{TypeName: "void", FldName: "size"}, Kind: 1}, }, AlignAttr: 4}}, - {Key: StructKey{Name: "nlattr_t[const[IFLA_BR_GROUP_ADDR, int16], int32]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[IFLA_BR_GROUP_ADDR, int16], int32]", TypeSize: 8}, Fields: []Type{ + {Key: StructKey{Name: "nlattr_t[const[IFLA_BR_GROUP_ADDR, int16], mac_addr]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[IFLA_BR_GROUP_ADDR, int16], mac_addr]", TypeSize: 12}, Fields: []Type{ &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "offsetof", FldName: "nla_len", TypeSize: 2}}, BitSize: 8, Offset: true, Path: []string{"size"}}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 20}, - &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "payload", TypeSize: 4}}}, + &UnionType{Key: StructKey{Name: "mac_addr"}, FldName: "payload"}, &BufferType{TypeCommon: TypeCommon{TypeName: "void", FldName: "size"}, Kind: 1}, + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 2}}, IsPad: true}, }, AlignAttr: 4}}, {Key: StructKey{Name: "nlattr_t[const[IFLA_BR_GROUP_FWD_MASK, int16], int32]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[IFLA_BR_GROUP_FWD_MASK, int16], int32]", TypeSize: 8}, Fields: []Type{ &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "offsetof", FldName: "nla_len", TypeSize: 2}}, BitSize: 8, Offset: true, Path: []string{"size"}}, @@ -74259,4 +74260,4 @@ var consts_arm64 = []ConstValue{ {Name: "bpf_insn_load_imm_dw", Value: 24}, } -const revision_arm64 = "e2c8f572ca948eadfe0315c4e0dbd88d012f1096" +const revision_arm64 = "62f97eb833cca08375d2cc0950f1fb44b9825d75" diff --git a/sys/linux/gen/mips64le.go b/sys/linux/gen/mips64le.go index 803722863..51b76f377 100644 --- a/sys/linux/gen/mips64le.go +++ b/sys/linux/gen/mips64le.go @@ -1503,7 +1503,7 @@ var structDescs_mips64le = []*KeyedStruct{ &StructType{Key: StructKey{Name: "nlattr_t[const[IFLA_BR_VLAN_FILTERING, int16], int8]"}, FldName: "IFLA_BR_VLAN_FILTERING"}, &StructType{Key: StructKey{Name: "nlattr_t[const[IFLA_BR_VLAN_PROTOCOL, int16], int32]"}, FldName: "IFLA_BR_VLAN_PROTOCOL"}, &StructType{Key: StructKey{Name: "nlattr_t[const[IFLA_BR_GROUP_FWD_MASK, int16], int32]"}, FldName: "IFLA_BR_GROUP_FWD_MASK"}, - &StructType{Key: StructKey{Name: "nlattr_t[const[IFLA_BR_GROUP_ADDR, int16], int32]"}, FldName: "IFLA_BR_GROUP_ADDR"}, + &StructType{Key: StructKey{Name: "nlattr_t[const[IFLA_BR_GROUP_ADDR, int16], mac_addr]"}, FldName: "IFLA_BR_GROUP_ADDR"}, &StructType{Key: StructKey{Name: "nlattr_t[const[IFLA_BR_MCAST_ROUTER, int16], int32]"}, FldName: "IFLA_BR_MCAST_ROUTER"}, &StructType{Key: StructKey{Name: "nlattr_t[const[IFLA_BR_MCAST_SNOOPING, int16], int32]"}, FldName: "IFLA_BR_MCAST_SNOOPING"}, &StructType{Key: StructKey{Name: "nlattr_t[const[IFLA_BR_MCAST_QUERY_USE_IFADDR, int16], int32]"}, FldName: "IFLA_BR_MCAST_QUERY_USE_IFADDR"}, @@ -22332,11 +22332,12 @@ var structDescs_mips64le = []*KeyedStruct{ &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "payload", TypeSize: 4}}, Kind: 1, RangeBegin: 2, RangeEnd: 30}, &BufferType{TypeCommon: TypeCommon{TypeName: "void", FldName: "size"}, Kind: 1}, }, AlignAttr: 4}}, - {Key: StructKey{Name: "nlattr_t[const[IFLA_BR_GROUP_ADDR, int16], int32]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[IFLA_BR_GROUP_ADDR, int16], int32]", TypeSize: 8}, Fields: []Type{ + {Key: StructKey{Name: "nlattr_t[const[IFLA_BR_GROUP_ADDR, int16], mac_addr]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[IFLA_BR_GROUP_ADDR, int16], mac_addr]", TypeSize: 12}, Fields: []Type{ &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "offsetof", FldName: "nla_len", TypeSize: 2}}, BitSize: 8, Offset: true, Path: []string{"size"}}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 20}, - &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "payload", TypeSize: 4}}}, + &UnionType{Key: StructKey{Name: "mac_addr"}, FldName: "payload"}, &BufferType{TypeCommon: TypeCommon{TypeName: "void", FldName: "size"}, Kind: 1}, + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 2}}, IsPad: true}, }, AlignAttr: 4}}, {Key: StructKey{Name: "nlattr_t[const[IFLA_BR_GROUP_FWD_MASK, int16], int32]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[IFLA_BR_GROUP_FWD_MASK, int16], int32]", TypeSize: 8}, Fields: []Type{ &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "offsetof", FldName: "nla_len", TypeSize: 2}}, BitSize: 8, Offset: true, Path: []string{"size"}}, @@ -71882,4 +71883,4 @@ var consts_mips64le = []ConstValue{ {Name: "bpf_insn_load_imm_dw", Value: 24}, } -const revision_mips64le = "882114fc35c868da406afe54562c7d51ce0d0652" +const revision_mips64le = "5f0575e6737d52afce80f1c11f1f25dfaf4595e7" diff --git a/sys/linux/gen/ppc64le.go b/sys/linux/gen/ppc64le.go index a58a244eb..b68f8f888 100644 --- a/sys/linux/gen/ppc64le.go +++ b/sys/linux/gen/ppc64le.go @@ -1505,7 +1505,7 @@ var structDescs_ppc64le = []*KeyedStruct{ &StructType{Key: StructKey{Name: "nlattr_t[const[IFLA_BR_VLAN_FILTERING, int16], int8]"}, FldName: "IFLA_BR_VLAN_FILTERING"}, &StructType{Key: StructKey{Name: "nlattr_t[const[IFLA_BR_VLAN_PROTOCOL, int16], int32]"}, FldName: "IFLA_BR_VLAN_PROTOCOL"}, &StructType{Key: StructKey{Name: "nlattr_t[const[IFLA_BR_GROUP_FWD_MASK, int16], int32]"}, FldName: "IFLA_BR_GROUP_FWD_MASK"}, - &StructType{Key: StructKey{Name: "nlattr_t[const[IFLA_BR_GROUP_ADDR, int16], int32]"}, FldName: "IFLA_BR_GROUP_ADDR"}, + &StructType{Key: StructKey{Name: "nlattr_t[const[IFLA_BR_GROUP_ADDR, int16], mac_addr]"}, FldName: "IFLA_BR_GROUP_ADDR"}, &StructType{Key: StructKey{Name: "nlattr_t[const[IFLA_BR_MCAST_ROUTER, int16], int32]"}, FldName: "IFLA_BR_MCAST_ROUTER"}, &StructType{Key: StructKey{Name: "nlattr_t[const[IFLA_BR_MCAST_SNOOPING, int16], int32]"}, FldName: "IFLA_BR_MCAST_SNOOPING"}, &StructType{Key: StructKey{Name: "nlattr_t[const[IFLA_BR_MCAST_QUERY_USE_IFADDR, int16], int32]"}, FldName: "IFLA_BR_MCAST_QUERY_USE_IFADDR"}, @@ -22334,11 +22334,12 @@ var structDescs_ppc64le = []*KeyedStruct{ &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "payload", TypeSize: 4}}, Kind: 1, RangeBegin: 2, RangeEnd: 30}, &BufferType{TypeCommon: TypeCommon{TypeName: "void", FldName: "size"}, Kind: 1}, }, AlignAttr: 4}}, - {Key: StructKey{Name: "nlattr_t[const[IFLA_BR_GROUP_ADDR, int16], int32]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[IFLA_BR_GROUP_ADDR, int16], int32]", TypeSize: 8}, Fields: []Type{ + {Key: StructKey{Name: "nlattr_t[const[IFLA_BR_GROUP_ADDR, int16], mac_addr]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[IFLA_BR_GROUP_ADDR, int16], mac_addr]", TypeSize: 12}, Fields: []Type{ &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "offsetof", FldName: "nla_len", TypeSize: 2}}, BitSize: 8, Offset: true, Path: []string{"size"}}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 20}, - &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "payload", TypeSize: 4}}}, + &UnionType{Key: StructKey{Name: "mac_addr"}, FldName: "payload"}, &BufferType{TypeCommon: TypeCommon{TypeName: "void", FldName: "size"}, Kind: 1}, + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 2}}, IsPad: true}, }, AlignAttr: 4}}, {Key: StructKey{Name: "nlattr_t[const[IFLA_BR_GROUP_FWD_MASK, int16], int32]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[IFLA_BR_GROUP_FWD_MASK, int16], int32]", TypeSize: 8}, Fields: []Type{ &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "offsetof", FldName: "nla_len", TypeSize: 2}}, BitSize: 8, Offset: true, Path: []string{"size"}}, @@ -74218,4 +74219,4 @@ var consts_ppc64le = []ConstValue{ {Name: "bpf_insn_load_imm_dw", Value: 24}, } -const revision_ppc64le = "269f710e7e2bb00dfa01c523577de9694e851cf2" +const revision_ppc64le = "082f86d58ef99c70b582a0109d2c0c239cc8147c" diff --git a/sys/linux/socket_netlink_route.txt b/sys/linux/socket_netlink_route.txt index e4c0c9f02..df032ee1b 100644 --- a/sys/linux/socket_netlink_route.txt +++ b/sys/linux/socket_netlink_route.txt @@ -397,7 +397,7 @@ br_policy [ IFLA_BR_VLAN_FILTERING nlattr[IFLA_BR_VLAN_FILTERING, int8] IFLA_BR_VLAN_PROTOCOL nlattr[IFLA_BR_VLAN_PROTOCOL, int32] IFLA_BR_GROUP_FWD_MASK nlattr[IFLA_BR_GROUP_FWD_MASK, int32] - IFLA_BR_GROUP_ADDR nlattr[IFLA_BR_GROUP_ADDR, int32] + IFLA_BR_GROUP_ADDR nlattr[IFLA_BR_GROUP_ADDR, mac_addr] IFLA_BR_MCAST_ROUTER nlattr[IFLA_BR_MCAST_ROUTER, int32] IFLA_BR_MCAST_SNOOPING nlattr[IFLA_BR_MCAST_SNOOPING, int32] IFLA_BR_MCAST_QUERY_USE_IFADDR nlattr[IFLA_BR_MCAST_QUERY_USE_IFADDR, int32] -- cgit mrf-deployment