reordering unions for trace2syz

7 files changed, 17 insertions, 17 deletions

diff --git a/sys/linux/bpf.txt b/sys/linux/bpf.txt
index 240ea7239..0d91c2f7a 100644
--- a/sys/linux/bpf.txt
+++ b/sys/linux/bpf.txt
@@ -102,8 +102,8 @@ bpf_licenses = "GPL", "syzkaller"
 bpf_kern_version = 0x40f00, 0x41000, 0x41100
 
 bpf_instructions [
-	framed	bpf_framed_program
 	raw	array[bpf_insn]
+	framed	bpf_framed_program
 ] [varlen]
 
 bpf_framed_program {
diff --git a/sys/linux/gen/386.go b/sys/linux/gen/386.go
index 8c7ed0d69..b8e15e018 100644
--- a/sys/linux/gen/386.go
+++ b/sys/linux/gen/386.go
@@ -859,8 +859,8 @@ var structDescs_386 = []*KeyedStruct{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "imm2", TypeSize: 4}}},
 	}}},
 	{Key: StructKey{Name: "bpf_instructions"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "bpf_instructions", IsVarlen: true}, Fields: []Type{
-		&StructType{Key: StructKey{Name: "bpf_framed_program"}, FldName: "framed"},
 		&ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "raw", IsVarlen: true}, Type: &UnionType{Key: StructKey{Name: "bpf_insn"}}},
+		&StructType{Key: StructKey{Name: "bpf_framed_program"}, FldName: "framed"},
 	}}},
 	{Key: StructKey{Name: "bpf_map_create_arg"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "bpf_map_create_arg", TypeSize: 44}, Fields: []Type{
 		&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bpf_map_type", FldName: "type", TypeSize: 4}}, Vals: []uint64{1, 2, 3, 4, 7, 8, 5, 6, 9, 10, 11, 12, 13, 14, 15, 16}},
@@ -5856,8 +5856,8 @@ var structDescs_386 = []*KeyedStruct{
 		&ResourceType{TypeCommon: TypeCommon{TypeName: "ifindex", FldName: "ifa_index", TypeSize: 4}},
 	}}},
 	{Key: StructKey{Name: "ifconf", Dir: 2}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "ifconf", TypeSize: 8, ArgDir: 2}, Fields: []Type{
-		&StructType{Key: StructKey{Name: "ifconf_buf", Dir: 2}, FldName: "buf"},
 		&StructType{Key: StructKey{Name: "ifconf_req", Dir: 2}, FldName: "req"},
+		&StructType{Key: StructKey{Name: "ifconf_buf", Dir: 2}, FldName: "buf"},
 	}}},
 	{Key: StructKey{Name: "ifconf_buf", Dir: 2}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "ifconf_buf", TypeSize: 8, ArgDir: 2}, Fields: []Type{
 		&LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "ifc_len", TypeSize: 4, ArgDir: 2}}, Buf: "ifcu_buf"},
@@ -42240,4 +42240,4 @@ var consts_386 = []ConstValue{
 	{Name: "bpf_insn_load_imm_dw", Value: 24},
 }
 
-const revision_386 = "6a304fe36aa7cc44b1c122127305b92bd5bd7abc"
+const revision_386 = "5e6818311dd35d3cd983762158b51ed8d783594d"
diff --git a/sys/linux/gen/amd64.go b/sys/linux/gen/amd64.go
index 58f81e309..5f150bd6d 100644
--- a/sys/linux/gen/amd64.go
+++ b/sys/linux/gen/amd64.go
@@ -867,8 +867,8 @@ var structDescs_amd64 = []*KeyedStruct{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "imm2", TypeSize: 4}}},
 	}}},
 	{Key: StructKey{Name: "bpf_instructions"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "bpf_instructions", IsVarlen: true}, Fields: []Type{
-		&StructType{Key: StructKey{Name: "bpf_framed_program"}, FldName: "framed"},
 		&ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "raw", IsVarlen: true}, Type: &UnionType{Key: StructKey{Name: "bpf_insn"}}},
+		&StructType{Key: StructKey{Name: "bpf_framed_program"}, FldName: "framed"},
 	}}},
 	{Key: StructKey{Name: "bpf_map_create_arg"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "bpf_map_create_arg", TypeSize: 44}, Fields: []Type{
 		&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bpf_map_type", FldName: "type", TypeSize: 4}}, Vals: []uint64{1, 2, 3, 4, 7, 8, 5, 6, 9, 10, 11, 12, 13, 14, 15, 16}},
@@ -5961,8 +5961,8 @@ var structDescs_amd64 = []*KeyedStruct{
 		&ResourceType{TypeCommon: TypeCommon{TypeName: "ifindex", FldName: "ifa_index", TypeSize: 4}},
 	}}},
 	{Key: StructKey{Name: "ifconf", Dir: 2}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "ifconf", TypeSize: 16, ArgDir: 2}, Fields: []Type{
-		&StructType{Key: StructKey{Name: "ifconf_buf", Dir: 2}, FldName: "buf"},
 		&StructType{Key: StructKey{Name: "ifconf_req", Dir: 2}, FldName: "req"},
+		&StructType{Key: StructKey{Name: "ifconf_buf", Dir: 2}, FldName: "buf"},
 	}}},
 	{Key: StructKey{Name: "ifconf_buf", Dir: 2}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "ifconf_buf", TypeSize: 16, ArgDir: 2}, Fields: []Type{
 		&LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "ifc_len", TypeSize: 4, ArgDir: 2}}, Buf: "ifcu_buf"},
@@ -42942,4 +42942,4 @@ var consts_amd64 = []ConstValue{
 	{Name: "bpf_insn_load_imm_dw", Value: 24},
 }
 
-const revision_amd64 = "2645a893a2d32dcfd65cd5481679daef97243b90"
+const revision_amd64 = "6371187aad52cb26b8056bd8e0e7b1c37b421112"
diff --git a/sys/linux/gen/arm.go b/sys/linux/gen/arm.go
index ca4916b42..3a8705790 100644
--- a/sys/linux/gen/arm.go
+++ b/sys/linux/gen/arm.go
@@ -864,8 +864,8 @@ var structDescs_arm = []*KeyedStruct{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "imm2", TypeSize: 4}}},
 	}}},
 	{Key: StructKey{Name: "bpf_instructions"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "bpf_instructions", IsVarlen: true}, Fields: []Type{
-		&StructType{Key: StructKey{Name: "bpf_framed_program"}, FldName: "framed"},
 		&ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "raw", IsVarlen: true}, Type: &UnionType{Key: StructKey{Name: "bpf_insn"}}},
+		&StructType{Key: StructKey{Name: "bpf_framed_program"}, FldName: "framed"},
 	}}},
 	{Key: StructKey{Name: "bpf_map_create_arg"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "bpf_map_create_arg", TypeSize: 44}, Fields: []Type{
 		&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bpf_map_type", FldName: "type", TypeSize: 4}}, Vals: []uint64{1, 2, 3, 4, 7, 8, 5, 6, 9, 10, 11, 12, 13, 14, 15, 16}},
@@ -5861,8 +5861,8 @@ var structDescs_arm = []*KeyedStruct{
 		&ResourceType{TypeCommon: TypeCommon{TypeName: "ifindex", FldName: "ifa_index", TypeSize: 4}},
 	}}},
 	{Key: StructKey{Name: "ifconf", Dir: 2}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "ifconf", TypeSize: 8, ArgDir: 2}, Fields: []Type{
-		&StructType{Key: StructKey{Name: "ifconf_buf", Dir: 2}, FldName: "buf"},
 		&StructType{Key: StructKey{Name: "ifconf_req", Dir: 2}, FldName: "req"},
+		&StructType{Key: StructKey{Name: "ifconf_buf", Dir: 2}, FldName: "buf"},
 	}}},
 	{Key: StructKey{Name: "ifconf_buf", Dir: 2}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "ifconf_buf", TypeSize: 8, ArgDir: 2}, Fields: []Type{
 		&LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "ifc_len", TypeSize: 4, ArgDir: 2}}, Buf: "ifcu_buf"},
@@ -42079,4 +42079,4 @@ var consts_arm = []ConstValue{
 	{Name: "bpf_insn_load_imm_dw", Value: 24},
 }
 
-const revision_arm = "fb7b022d967977f5a19598116fe04dd29eeff7cc"
+const revision_arm = "e9a272852c9169555d05c5ec15ae13b73270a6d8"
diff --git a/sys/linux/gen/arm64.go b/sys/linux/gen/arm64.go
index e859ed3ef..eef9c3067 100644
--- a/sys/linux/gen/arm64.go
+++ b/sys/linux/gen/arm64.go
@@ -867,8 +867,8 @@ var structDescs_arm64 = []*KeyedStruct{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "imm2", TypeSize: 4}}},
 	}}},
 	{Key: StructKey{Name: "bpf_instructions"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "bpf_instructions", IsVarlen: true}, Fields: []Type{
-		&StructType{Key: StructKey{Name: "bpf_framed_program"}, FldName: "framed"},
 		&ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "raw", IsVarlen: true}, Type: &UnionType{Key: StructKey{Name: "bpf_insn"}}},
+		&StructType{Key: StructKey{Name: "bpf_framed_program"}, FldName: "framed"},
 	}}},
 	{Key: StructKey{Name: "bpf_map_create_arg"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "bpf_map_create_arg", TypeSize: 44}, Fields: []Type{
 		&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bpf_map_type", FldName: "type", TypeSize: 4}}, Vals: []uint64{1, 2, 3, 4, 7, 8, 5, 6, 9, 10, 11, 12, 13, 14, 15, 16}},
@@ -5961,8 +5961,8 @@ var structDescs_arm64 = []*KeyedStruct{
 		&ResourceType{TypeCommon: TypeCommon{TypeName: "ifindex", FldName: "ifa_index", TypeSize: 4}},
 	}}},
 	{Key: StructKey{Name: "ifconf", Dir: 2}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "ifconf", TypeSize: 16, ArgDir: 2}, Fields: []Type{
-		&StructType{Key: StructKey{Name: "ifconf_buf", Dir: 2}, FldName: "buf"},
 		&StructType{Key: StructKey{Name: "ifconf_req", Dir: 2}, FldName: "req"},
+		&StructType{Key: StructKey{Name: "ifconf_buf", Dir: 2}, FldName: "buf"},
 	}}},
 	{Key: StructKey{Name: "ifconf_buf", Dir: 2}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "ifconf_buf", TypeSize: 16, ArgDir: 2}, Fields: []Type{
 		&LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "ifc_len", TypeSize: 4, ArgDir: 2}}, Buf: "ifcu_buf"},
@@ -42300,4 +42300,4 @@ var consts_arm64 = []ConstValue{
 	{Name: "bpf_insn_load_imm_dw", Value: 24},
 }
 
-const revision_arm64 = "8d8f56ae6230f5f715cc1daae19c1aeca84b55bf"
+const revision_arm64 = "fe2c42daf96bf7cc695f5e75e99f8706a4561574"
diff --git a/sys/linux/gen/ppc64le.go b/sys/linux/gen/ppc64le.go
index 58b7d8531..b65f718d7 100644
--- a/sys/linux/gen/ppc64le.go
+++ b/sys/linux/gen/ppc64le.go
@@ -858,8 +858,8 @@ var structDescs_ppc64le = []*KeyedStruct{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "imm2", TypeSize: 4}}},
 	}}},
 	{Key: StructKey{Name: "bpf_instructions"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "bpf_instructions", IsVarlen: true}, Fields: []Type{
-		&StructType{Key: StructKey{Name: "bpf_framed_program"}, FldName: "framed"},
 		&ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "raw", IsVarlen: true}, Type: &UnionType{Key: StructKey{Name: "bpf_insn"}}},
+		&StructType{Key: StructKey{Name: "bpf_framed_program"}, FldName: "framed"},
 	}}},
 	{Key: StructKey{Name: "bpf_map_create_arg"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "bpf_map_create_arg", TypeSize: 44}, Fields: []Type{
 		&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bpf_map_type", FldName: "type", TypeSize: 4}}, Vals: []uint64{1, 2, 3, 4, 7, 8, 5, 6, 9, 10, 11, 12, 13, 14, 15, 16}},
@@ -5952,8 +5952,8 @@ var structDescs_ppc64le = []*KeyedStruct{
 		&ResourceType{TypeCommon: TypeCommon{TypeName: "ifindex", FldName: "ifa_index", TypeSize: 4}},
 	}}},
 	{Key: StructKey{Name: "ifconf", Dir: 2}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "ifconf", TypeSize: 16, ArgDir: 2}, Fields: []Type{
-		&StructType{Key: StructKey{Name: "ifconf_buf", Dir: 2}, FldName: "buf"},
 		&StructType{Key: StructKey{Name: "ifconf_req", Dir: 2}, FldName: "req"},
+		&StructType{Key: StructKey{Name: "ifconf_buf", Dir: 2}, FldName: "buf"},
 	}}},
 	{Key: StructKey{Name: "ifconf_buf", Dir: 2}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "ifconf_buf", TypeSize: 16, ArgDir: 2}, Fields: []Type{
 		&LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "ifc_len", TypeSize: 4, ArgDir: 2}}, Buf: "ifcu_buf"},
@@ -39658,4 +39658,4 @@ var consts_ppc64le = []ConstValue{
 	{Name: "bpf_insn_load_imm_dw", Value: 24},
 }
 
-const revision_ppc64le = "0a0ce255671d68f675f67d88ada511bfd3b26ad0"
+const revision_ppc64le = "8697aac8373b0233bfce020b019b9b78b624a2fd"
diff --git a/sys/linux/socket.txt b/sys/linux/socket.txt
index 1f4b0cfce..0bfa782b6 100644
--- a/sys/linux/socket.txt
+++ b/sys/linux/socket.txt
@@ -342,8 +342,8 @@ te1_settings {
 }
 
 ifconf [
-	buf	ifconf_buf
 	req	ifconf_req
+	buf	ifconf_buf
 ]
 
 ifconf_buf {