sys/linux: use template base to simplify pppox description

Co-authored-by: Dmitry Vyukov <dvyukov@google.com>
Signed-off-by: Paul Chaignon <paul.chaignon@orange.com>

7 files changed, 183 insertions, 200 deletions

diff --git a/sys/linux/gen/386.go b/sys/linux/gen/386.go
index 3b1d1a187..d76b23e12 100644
--- a/sys/linux/gen/386.go
+++ b/sys/linux/gen/386.go
@@ -20838,7 +20838,7 @@ var structDescs_386 = []*KeyedStruct{
 		&UnionType{Key: StructKey{Name: "mac_addr", Dir: 1}, FldName: "remote"},
 		&BufferType{TypeCommon: TypeCommon{TypeName: "string", FldName: "dev", TypeSize: 16, ArgDir: 1}, Kind: 2, SubKind: "devnames", Values: []string{"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "lo\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "tunl0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "gre0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "gretap0\x00\x00\x00\x00\x00\x00\x00\x00\x00", "ip_vti0\x00\x00\x00\x00\x00\x00\x00\x00\x00", "ip6_vti0\x00\x00\x00\x00\x00\x00\x00\x00", "sit0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "ip6tnl0\x00\x00\x00\x00\x00\x00\x00\x00\x00", "ip6gre0\x00\x00\x00\x00\x00\x00\x00\x00\x00", "ip6gretap0\x00\x00\x00\x00\x00\x00", "bond0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "dummy0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "eql\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "ifb0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "ipddp0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "yam0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "bcsf0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "bcsh0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "teql0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "nr0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "rose0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "irlan0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "erspan0\x00\x00\x00\x00\x00\x00\x00\x00\x00", "bpq0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "vlan0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "bridge0\x00\x00\x00\x00\x00\x00\x00\x00\x00", "vcan0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "team0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "syz_tun\x00\x00\x00\x00\x00\x00\x00\x00\x00", "veth0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "veth1\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "veth0_to_bridge\x00", "veth1_to_bridge\x00", "veth0_to_bond\x00\x00\x00", "veth1_to_bond\x00\x00\x00", "veth0_to_team\x00\x00\x00", "veth1_to_team\x00\x00\x00", "bridge_slave_0\x00\x00", "bridge_slave_1\x00\x00", "bond_slave_0\x00\x00\x00\x00", "bond_slave_1\x00\x00\x00\x00", "team_slave_0\x00\x00\x00\x00", "team_slave_1\x00\x00\x00\x00", "syzkaller0\x00\x00\x00\x00\x00\x00", "syzkaller1\x00\x00\x00\x00\x00\x00", "lapb0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "hwsim0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "rose0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "nr0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "veth0_to_hsr\x00\x00\x00\x00", "veth1_to_hsr\x00\x00\x00\x00", "hsr0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "ip6erspan0\x00\x00\x00\x00\x00\x00", "nlmon0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "vxcan1\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "caif0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "batadv0\x00\x00\x00\x00\x00\x00\x00\x00\x00", "netdevsim0\x00\x00\x00\x00\x00\x00"}},
 	}}},
-	{Key: StructKey{Name: "pppol2tp_addr"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "pppol2tp_addr", TypeSize: 32}, Fields: []Type{
+	{Key: StructKey{Name: "pppol2tp_addr_t[int16]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "pppol2tp_addr_t[int16]", TypeSize: 32}, Fields: []Type{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "pid", TypeSize: 4}}},
 		&ResourceType{TypeCommon: TypeCommon{TypeName: "sock", FldName: "fd", TypeSize: 4}},
 		&StructType{Key: StructKey{Name: "sockaddr_in"}, FldName: "addr"},
@@ -20847,7 +20847,7 @@ var structDescs_386 = []*KeyedStruct{
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "d_tunnel", TypeSize: 2}}, Kind: 1, RangeEnd: 4},
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "d_session", TypeSize: 2}}, Kind: 1, RangeEnd: 4},
 	}}},
-	{Key: StructKey{Name: "pppol2tp_addr", Dir: 1}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "pppol2tp_addr", TypeSize: 32, ArgDir: 1}, Fields: []Type{
+	{Key: StructKey{Name: "pppol2tp_addr_t[int16]", Dir: 1}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "pppol2tp_addr_t[int16]", TypeSize: 32, ArgDir: 1}, Fields: []Type{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "pid", TypeSize: 4, ArgDir: 1}}},
 		&ResourceType{TypeCommon: TypeCommon{TypeName: "sock", FldName: "fd", TypeSize: 4, ArgDir: 1}},
 		&StructType{Key: StructKey{Name: "sockaddr_in", Dir: 1}, FldName: "addr"},
@@ -20856,25 +20856,7 @@ var structDescs_386 = []*KeyedStruct{
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "d_tunnel", TypeSize: 2, ArgDir: 1}}, Kind: 1, RangeEnd: 4},
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "d_session", TypeSize: 2, ArgDir: 1}}, Kind: 1, RangeEnd: 4},
 	}}},
-	{Key: StructKey{Name: "pppol2tpin6_addr"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "pppol2tpin6_addr", TypeSize: 44}, Fields: []Type{
-		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "pid", TypeSize: 4}}},
-		&ResourceType{TypeCommon: TypeCommon{TypeName: "sock", FldName: "fd", TypeSize: 4}},
-		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "s_tunnel", TypeSize: 2}}, Kind: 1, RangeEnd: 4},
-		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "s_session", TypeSize: 2}}, Kind: 1, RangeEnd: 4},
-		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "d_tunnel", TypeSize: 2}}, Kind: 1, RangeEnd: 4},
-		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "d_session", TypeSize: 2}}, Kind: 1, RangeEnd: 4},
-		&StructType{Key: StructKey{Name: "sockaddr_in6"}, FldName: "addr"},
-	}}},
-	{Key: StructKey{Name: "pppol2tpin6_addr", Dir: 1}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "pppol2tpin6_addr", TypeSize: 44, ArgDir: 1}, Fields: []Type{
-		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "pid", TypeSize: 4, ArgDir: 1}}},
-		&ResourceType{TypeCommon: TypeCommon{TypeName: "sock", FldName: "fd", TypeSize: 4, ArgDir: 1}},
-		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "s_tunnel", TypeSize: 2, ArgDir: 1}}, Kind: 1, RangeEnd: 4},
-		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "s_session", TypeSize: 2, ArgDir: 1}}, Kind: 1, RangeEnd: 4},
-		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "d_tunnel", TypeSize: 2, ArgDir: 1}}, Kind: 1, RangeEnd: 4},
-		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "d_session", TypeSize: 2, ArgDir: 1}}, Kind: 1, RangeEnd: 4},
-		&StructType{Key: StructKey{Name: "sockaddr_in6", Dir: 1}, FldName: "addr"},
-	}}},
-	{Key: StructKey{Name: "pppol2tpv3_addr"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "pppol2tpv3_addr", TypeSize: 40}, Fields: []Type{
+	{Key: StructKey{Name: "pppol2tp_addr_t[int32]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "pppol2tp_addr_t[int32]", TypeSize: 40}, Fields: []Type{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "pid", TypeSize: 4}}},
 		&ResourceType{TypeCommon: TypeCommon{TypeName: "sock", FldName: "fd", TypeSize: 4}},
 		&StructType{Key: StructKey{Name: "sockaddr_in"}, FldName: "addr"},
@@ -20883,7 +20865,7 @@ var structDescs_386 = []*KeyedStruct{
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "d_tunnel", TypeSize: 4}}, Kind: 1, RangeEnd: 4},
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "d_session", TypeSize: 4}}, Kind: 1, RangeEnd: 4},
 	}}},
-	{Key: StructKey{Name: "pppol2tpv3_addr", Dir: 1}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "pppol2tpv3_addr", TypeSize: 40, ArgDir: 1}, Fields: []Type{
+	{Key: StructKey{Name: "pppol2tp_addr_t[int32]", Dir: 1}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "pppol2tp_addr_t[int32]", TypeSize: 40, ArgDir: 1}, Fields: []Type{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "pid", TypeSize: 4, ArgDir: 1}}},
 		&ResourceType{TypeCommon: TypeCommon{TypeName: "sock", FldName: "fd", TypeSize: 4, ArgDir: 1}},
 		&StructType{Key: StructKey{Name: "sockaddr_in", Dir: 1}, FldName: "addr"},
@@ -20892,7 +20874,25 @@ var structDescs_386 = []*KeyedStruct{
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "d_tunnel", TypeSize: 4, ArgDir: 1}}, Kind: 1, RangeEnd: 4},
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "d_session", TypeSize: 4, ArgDir: 1}}, Kind: 1, RangeEnd: 4},
 	}}},
-	{Key: StructKey{Name: "pppol2tpv3in6_addr"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "pppol2tpv3in6_addr", TypeSize: 52}, Fields: []Type{
+	{Key: StructKey{Name: "pppol2tpin6_addr_t[int16]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "pppol2tpin6_addr_t[int16]", TypeSize: 44}, Fields: []Type{
+		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "pid", TypeSize: 4}}},
+		&ResourceType{TypeCommon: TypeCommon{TypeName: "sock", FldName: "fd", TypeSize: 4}},
+		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "s_tunnel", TypeSize: 2}}, Kind: 1, RangeEnd: 4},
+		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "s_session", TypeSize: 2}}, Kind: 1, RangeEnd: 4},
+		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "d_tunnel", TypeSize: 2}}, Kind: 1, RangeEnd: 4},
+		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "d_session", TypeSize: 2}}, Kind: 1, RangeEnd: 4},
+		&StructType{Key: StructKey{Name: "sockaddr_in6"}, FldName: "addr"},
+	}}},
+	{Key: StructKey{Name: "pppol2tpin6_addr_t[int16]", Dir: 1}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "pppol2tpin6_addr_t[int16]", TypeSize: 44, ArgDir: 1}, Fields: []Type{
+		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "pid", TypeSize: 4, ArgDir: 1}}},
+		&ResourceType{TypeCommon: TypeCommon{TypeName: "sock", FldName: "fd", TypeSize: 4, ArgDir: 1}},
+		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "s_tunnel", TypeSize: 2, ArgDir: 1}}, Kind: 1, RangeEnd: 4},
+		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "s_session", TypeSize: 2, ArgDir: 1}}, Kind: 1, RangeEnd: 4},
+		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "d_tunnel", TypeSize: 2, ArgDir: 1}}, Kind: 1, RangeEnd: 4},
+		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "d_session", TypeSize: 2, ArgDir: 1}}, Kind: 1, RangeEnd: 4},
+		&StructType{Key: StructKey{Name: "sockaddr_in6", Dir: 1}, FldName: "addr"},
+	}}},
+	{Key: StructKey{Name: "pppol2tpin6_addr_t[int32]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "pppol2tpin6_addr_t[int32]", TypeSize: 52}, Fields: []Type{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "pid", TypeSize: 4}}},
 		&ResourceType{TypeCommon: TypeCommon{TypeName: "sock", FldName: "fd", TypeSize: 4}},
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "s_tunnel", TypeSize: 4}}, Kind: 1, RangeEnd: 4},
@@ -20901,7 +20901,7 @@ var structDescs_386 = []*KeyedStruct{
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "d_session", TypeSize: 4}}, Kind: 1, RangeEnd: 4},
 		&StructType{Key: StructKey{Name: "sockaddr_in6"}, FldName: "addr"},
 	}}},
-	{Key: StructKey{Name: "pppol2tpv3in6_addr", Dir: 1}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "pppol2tpv3in6_addr", TypeSize: 52, ArgDir: 1}, Fields: []Type{
+	{Key: StructKey{Name: "pppol2tpin6_addr_t[int32]", Dir: 1}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "pppol2tpin6_addr_t[int32]", TypeSize: 52, ArgDir: 1}, Fields: []Type{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "pid", TypeSize: 4, ArgDir: 1}}},
 		&ResourceType{TypeCommon: TypeCommon{TypeName: "sock", FldName: "fd", TypeSize: 4, ArgDir: 1}},
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "s_tunnel", TypeSize: 4, ArgDir: 1}}, Kind: 1, RangeEnd: 4},
@@ -23601,42 +23601,42 @@ var structDescs_386 = []*KeyedStruct{
 	{Key: StructKey{Name: "sockaddr_l2tp_t[pppol2tp_addr]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "sockaddr_l2tp_t[pppol2tp_addr]", TypeSize: 38}, Fields: []Type{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "sa_family", TypeSize: 2}}, Val: 24},
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "sa_protocol", TypeSize: 4}}, Val: 1},
-		&StructType{Key: StructKey{Name: "pppol2tp_addr"}, FldName: "addr"},
+		&StructType{Key: StructKey{Name: "pppol2tp_addr_t[int16]"}, FldName: "addr"},
 	}}},
 	{Key: StructKey{Name: "sockaddr_l2tp_t[pppol2tp_addr]", Dir: 1}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "sockaddr_l2tp_t[pppol2tp_addr]", TypeSize: 38, ArgDir: 1}, Fields: []Type{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "sa_family", TypeSize: 2, ArgDir: 1}}, Val: 24},
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "sa_protocol", TypeSize: 4, ArgDir: 1}}, Val: 1},
-		&StructType{Key: StructKey{Name: "pppol2tp_addr", Dir: 1}, FldName: "addr"},
+		&StructType{Key: StructKey{Name: "pppol2tp_addr_t[int16]", Dir: 1}, FldName: "addr"},
 	}}},
 	{Key: StructKey{Name: "sockaddr_l2tp_t[pppol2tpin6_addr]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "sockaddr_l2tp_t[pppol2tpin6_addr]", TypeSize: 50}, Fields: []Type{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "sa_family", TypeSize: 2}}, Val: 24},
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "sa_protocol", TypeSize: 4}}, Val: 1},
-		&StructType{Key: StructKey{Name: "pppol2tpin6_addr"}, FldName: "addr"},
+		&StructType{Key: StructKey{Name: "pppol2tpin6_addr_t[int16]"}, FldName: "addr"},
 	}}},
 	{Key: StructKey{Name: "sockaddr_l2tp_t[pppol2tpin6_addr]", Dir: 1}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "sockaddr_l2tp_t[pppol2tpin6_addr]", TypeSize: 50, ArgDir: 1}, Fields: []Type{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "sa_family", TypeSize: 2, ArgDir: 1}}, Val: 24},
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "sa_protocol", TypeSize: 4, ArgDir: 1}}, Val: 1},
-		&StructType{Key: StructKey{Name: "pppol2tpin6_addr", Dir: 1}, FldName: "addr"},
+		&StructType{Key: StructKey{Name: "pppol2tpin6_addr_t[int16]", Dir: 1}, FldName: "addr"},
 	}}},
 	{Key: StructKey{Name: "sockaddr_l2tp_t[pppol2tpv3_addr]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "sockaddr_l2tp_t[pppol2tpv3_addr]", TypeSize: 46}, Fields: []Type{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "sa_family", TypeSize: 2}}, Val: 24},
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "sa_protocol", TypeSize: 4}}, Val: 1},
-		&StructType{Key: StructKey{Name: "pppol2tpv3_addr"}, FldName: "addr"},
+		&StructType{Key: StructKey{Name: "pppol2tp_addr_t[int32]"}, FldName: "addr"},
 	}}},
 	{Key: StructKey{Name: "sockaddr_l2tp_t[pppol2tpv3_addr]", Dir: 1}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "sockaddr_l2tp_t[pppol2tpv3_addr]", TypeSize: 46, ArgDir: 1}, Fields: []Type{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "sa_family", TypeSize: 2, ArgDir: 1}}, Val: 24},
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "sa_protocol", TypeSize: 4, ArgDir: 1}}, Val: 1},
-		&StructType{Key: StructKey{Name: "pppol2tpv3_addr", Dir: 1}, FldName: "addr"},
+		&StructType{Key: StructKey{Name: "pppol2tp_addr_t[int32]", Dir: 1}, FldName: "addr"},
 	}}},
 	{Key: StructKey{Name: "sockaddr_l2tp_t[pppol2tpv3in6_addr]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "sockaddr_l2tp_t[pppol2tpv3in6_addr]", TypeSize: 58}, Fields: []Type{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "sa_family", TypeSize: 2}}, Val: 24},
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "sa_protocol", TypeSize: 4}}, Val: 1},
-		&StructType{Key: StructKey{Name: "pppol2tpv3in6_addr"}, FldName: "addr"},
+		&StructType{Key: StructKey{Name: "pppol2tpin6_addr_t[int32]"}, FldName: "addr"},
 	}}},
 	{Key: StructKey{Name: "sockaddr_l2tp_t[pppol2tpv3in6_addr]", Dir: 1}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "sockaddr_l2tp_t[pppol2tpv3in6_addr]", TypeSize: 58, ArgDir: 1}, Fields: []Type{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "sa_family", TypeSize: 2, ArgDir: 1}}, Val: 24},
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "sa_protocol", TypeSize: 4, ArgDir: 1}}, Val: 1},
-		&StructType{Key: StructKey{Name: "pppol2tpv3in6_addr", Dir: 1}, FldName: "addr"},
+		&StructType{Key: StructKey{Name: "pppol2tpin6_addr_t[int32]", Dir: 1}, FldName: "addr"},
 	}}},
 	{Key: StructKey{Name: "sockaddr_ll"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "sockaddr_ll", TypeSize: 20}, Fields: []Type{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "sll_family", TypeSize: 2}}, Val: 17},
@@ -55322,4 +55322,4 @@ var consts_386 = []ConstValue{
 	{Name: "bpf_insn_load_imm_dw", Value: 24},
 }
 
-const revision_386 = "f9f075202e8db3adf0d84af0a3ef7dd9ce44f2cf"
+const revision_386 = "85d1c5998a241ed8144242a246c51cf69e212cea"
diff --git a/sys/linux/gen/amd64.go b/sys/linux/gen/amd64.go
index 697c48690..9e260a1c9 100644
--- a/sys/linux/gen/amd64.go
+++ b/sys/linux/gen/amd64.go
@@ -21144,7 +21144,7 @@ var structDescs_amd64 = []*KeyedStruct{
 		&UnionType{Key: StructKey{Name: "mac_addr", Dir: 1}, FldName: "remote"},
 		&BufferType{TypeCommon: TypeCommon{TypeName: "string", FldName: "dev", TypeSize: 16, ArgDir: 1}, Kind: 2, SubKind: "devnames", Values: []string{"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "lo\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "tunl0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "gre0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "gretap0\x00\x00\x00\x00\x00\x00\x00\x00\x00", "ip_vti0\x00\x00\x00\x00\x00\x00\x00\x00\x00", "ip6_vti0\x00\x00\x00\x00\x00\x00\x00\x00", "sit0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "ip6tnl0\x00\x00\x00\x00\x00\x00\x00\x00\x00", "ip6gre0\x00\x00\x00\x00\x00\x00\x00\x00\x00", "ip6gretap0\x00\x00\x00\x00\x00\x00", "bond0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "dummy0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "eql\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "ifb0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "ipddp0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "yam0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "bcsf0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "bcsh0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "teql0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "nr0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "rose0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "irlan0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "erspan0\x00\x00\x00\x00\x00\x00\x00\x00\x00", "bpq0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "vlan0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "bridge0\x00\x00\x00\x00\x00\x00\x00\x00\x00", "vcan0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "team0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "syz_tun\x00\x00\x00\x00\x00\x00\x00\x00\x00", "veth0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "veth1\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "veth0_to_bridge\x00", "veth1_to_bridge\x00", "veth0_to_bond\x00\x00\x00", "veth1_to_bond\x00\x00\x00", "veth0_to_team\x00\x00\x00", "veth1_to_team\x00\x00\x00", "bridge_slave_0\x00\x00", "bridge_slave_1\x00\x00", "bond_slave_0\x00\x00\x00\x00", "bond_slave_1\x00\x00\x00\x00", "team_slave_0\x00\x00\x00\x00", "team_slave_1\x00\x00\x00\x00", "syzkaller0\x00\x00\x00\x00\x00\x00", "syzkaller1\x00\x00\x00\x00\x00\x00", "lapb0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "hwsim0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "rose0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "nr0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "veth0_to_hsr\x00\x00\x00\x00", "veth1_to_hsr\x00\x00\x00\x00", "hsr0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "ip6erspan0\x00\x00\x00\x00\x00\x00", "nlmon0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "vxcan1\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "caif0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "batadv0\x00\x00\x00\x00\x00\x00\x00\x00\x00", "netdevsim0\x00\x00\x00\x00\x00\x00"}},
 	}}},
-	{Key: StructKey{Name: "pppol2tp_addr"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "pppol2tp_addr", TypeSize: 32}, Fields: []Type{
+	{Key: StructKey{Name: "pppol2tp_addr_t[int16]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "pppol2tp_addr_t[int16]", TypeSize: 32}, Fields: []Type{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "pid", TypeSize: 4}}},
 		&ResourceType{TypeCommon: TypeCommon{TypeName: "sock", FldName: "fd", TypeSize: 4}},
 		&StructType{Key: StructKey{Name: "sockaddr_in"}, FldName: "addr"},
@@ -21153,7 +21153,7 @@ var structDescs_amd64 = []*KeyedStruct{
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "d_tunnel", TypeSize: 2}}, Kind: 1, RangeEnd: 4},
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "d_session", TypeSize: 2}}, Kind: 1, RangeEnd: 4},
 	}}},
-	{Key: StructKey{Name: "pppol2tp_addr", Dir: 1}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "pppol2tp_addr", TypeSize: 32, ArgDir: 1}, Fields: []Type{
+	{Key: StructKey{Name: "pppol2tp_addr_t[int16]", Dir: 1}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "pppol2tp_addr_t[int16]", TypeSize: 32, ArgDir: 1}, Fields: []Type{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "pid", TypeSize: 4, ArgDir: 1}}},
 		&ResourceType{TypeCommon: TypeCommon{TypeName: "sock", FldName: "fd", TypeSize: 4, ArgDir: 1}},
 		&StructType{Key: StructKey{Name: "sockaddr_in", Dir: 1}, FldName: "addr"},
@@ -21162,25 +21162,7 @@ var structDescs_amd64 = []*KeyedStruct{
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "d_tunnel", TypeSize: 2, ArgDir: 1}}, Kind: 1, RangeEnd: 4},
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "d_session", TypeSize: 2, ArgDir: 1}}, Kind: 1, RangeEnd: 4},
 	}}},
-	{Key: StructKey{Name: "pppol2tpin6_addr"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "pppol2tpin6_addr", TypeSize: 44}, Fields: []Type{
-		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "pid", TypeSize: 4}}},
-		&ResourceType{TypeCommon: TypeCommon{TypeName: "sock", FldName: "fd", TypeSize: 4}},
-		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "s_tunnel", TypeSize: 2}}, Kind: 1, RangeEnd: 4},
-		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "s_session", TypeSize: 2}}, Kind: 1, RangeEnd: 4},
-		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "d_tunnel", TypeSize: 2}}, Kind: 1, RangeEnd: 4},
-		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "d_session", TypeSize: 2}}, Kind: 1, RangeEnd: 4},
-		&StructType{Key: StructKey{Name: "sockaddr_in6"}, FldName: "addr"},
-	}}},
-	{Key: StructKey{Name: "pppol2tpin6_addr", Dir: 1}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "pppol2tpin6_addr", TypeSize: 44, ArgDir: 1}, Fields: []Type{
-		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "pid", TypeSize: 4, ArgDir: 1}}},
-		&ResourceType{TypeCommon: TypeCommon{TypeName: "sock", FldName: "fd", TypeSize: 4, ArgDir: 1}},
-		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "s_tunnel", TypeSize: 2, ArgDir: 1}}, Kind: 1, RangeEnd: 4},
-		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "s_session", TypeSize: 2, ArgDir: 1}}, Kind: 1, RangeEnd: 4},
-		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "d_tunnel", TypeSize: 2, ArgDir: 1}}, Kind: 1, RangeEnd: 4},
-		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "d_session", TypeSize: 2, ArgDir: 1}}, Kind: 1, RangeEnd: 4},
-		&StructType{Key: StructKey{Name: "sockaddr_in6", Dir: 1}, FldName: "addr"},
-	}}},
-	{Key: StructKey{Name: "pppol2tpv3_addr"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "pppol2tpv3_addr", TypeSize: 40}, Fields: []Type{
+	{Key: StructKey{Name: "pppol2tp_addr_t[int32]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "pppol2tp_addr_t[int32]", TypeSize: 40}, Fields: []Type{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "pid", TypeSize: 4}}},
 		&ResourceType{TypeCommon: TypeCommon{TypeName: "sock", FldName: "fd", TypeSize: 4}},
 		&StructType{Key: StructKey{Name: "sockaddr_in"}, FldName: "addr"},
@@ -21189,7 +21171,7 @@ var structDescs_amd64 = []*KeyedStruct{
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "d_tunnel", TypeSize: 4}}, Kind: 1, RangeEnd: 4},
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "d_session", TypeSize: 4}}, Kind: 1, RangeEnd: 4},
 	}}},
-	{Key: StructKey{Name: "pppol2tpv3_addr", Dir: 1}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "pppol2tpv3_addr", TypeSize: 40, ArgDir: 1}, Fields: []Type{
+	{Key: StructKey{Name: "pppol2tp_addr_t[int32]", Dir: 1}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "pppol2tp_addr_t[int32]", TypeSize: 40, ArgDir: 1}, Fields: []Type{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "pid", TypeSize: 4, ArgDir: 1}}},
 		&ResourceType{TypeCommon: TypeCommon{TypeName: "sock", FldName: "fd", TypeSize: 4, ArgDir: 1}},
 		&StructType{Key: StructKey{Name: "sockaddr_in", Dir: 1}, FldName: "addr"},
@@ -21198,7 +21180,25 @@ var structDescs_amd64 = []*KeyedStruct{
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "d_tunnel", TypeSize: 4, ArgDir: 1}}, Kind: 1, RangeEnd: 4},
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "d_session", TypeSize: 4, ArgDir: 1}}, Kind: 1, RangeEnd: 4},
 	}}},
-	{Key: StructKey{Name: "pppol2tpv3in6_addr"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "pppol2tpv3in6_addr", TypeSize: 52}, Fields: []Type{
+	{Key: StructKey{Name: "pppol2tpin6_addr_t[int16]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "pppol2tpin6_addr_t[int16]", TypeSize: 44}, Fields: []Type{
+		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "pid", TypeSize: 4}}},
+		&ResourceType{TypeCommon: TypeCommon{TypeName: "sock", FldName: "fd", TypeSize: 4}},
+		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "s_tunnel", TypeSize: 2}}, Kind: 1, RangeEnd: 4},
+		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "s_session", TypeSize: 2}}, Kind: 1, RangeEnd: 4},
+		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "d_tunnel", TypeSize: 2}}, Kind: 1, RangeEnd: 4},
+		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "d_session", TypeSize: 2}}, Kind: 1, RangeEnd: 4},
+		&StructType{Key: StructKey{Name: "sockaddr_in6"}, FldName: "addr"},
+	}}},
+	{Key: StructKey{Name: "pppol2tpin6_addr_t[int16]", Dir: 1}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "pppol2tpin6_addr_t[int16]", TypeSize: 44, ArgDir: 1}, Fields: []Type{
+		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "pid", TypeSize: 4, ArgDir: 1}}},
+		&ResourceType{TypeCommon: TypeCommon{TypeName: "sock", FldName: "fd", TypeSize: 4, ArgDir: 1}},
+		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "s_tunnel", TypeSize: 2, ArgDir: 1}}, Kind: 1, RangeEnd: 4},
+		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "s_session", TypeSize: 2, ArgDir: 1}}, Kind: 1, RangeEnd: 4},
+		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "d_tunnel", TypeSize: 2, ArgDir: 1}}, Kind: 1, RangeEnd: 4},
+		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "d_session", TypeSize: 2, ArgDir: 1}}, Kind: 1, RangeEnd: 4},
+		&StructType{Key: StructKey{Name: "sockaddr_in6", Dir: 1}, FldName: "addr"},
+	}}},
+	{Key: StructKey{Name: "pppol2tpin6_addr_t[int32]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "pppol2tpin6_addr_t[int32]", TypeSize: 52}, Fields: []Type{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "pid", TypeSize: 4}}},
 		&ResourceType{TypeCommon: TypeCommon{TypeName: "sock", FldName: "fd", TypeSize: 4}},
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "s_tunnel", TypeSize: 4}}, Kind: 1, RangeEnd: 4},
@@ -21207,7 +21207,7 @@ var structDescs_amd64 = []*KeyedStruct{
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "d_session", TypeSize: 4}}, Kind: 1, RangeEnd: 4},
 		&StructType{Key: StructKey{Name: "sockaddr_in6"}, FldName: "addr"},
 	}}},
-	{Key: StructKey{Name: "pppol2tpv3in6_addr", Dir: 1}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "pppol2tpv3in6_addr", TypeSize: 52, ArgDir: 1}, Fields: []Type{
+	{Key: StructKey{Name: "pppol2tpin6_addr_t[int32]", Dir: 1}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "pppol2tpin6_addr_t[int32]", TypeSize: 52, ArgDir: 1}, Fields: []Type{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "pid", TypeSize: 4, ArgDir: 1}}},
 		&ResourceType{TypeCommon: TypeCommon{TypeName: "sock", FldName: "fd", TypeSize: 4, ArgDir: 1}},
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "s_tunnel", TypeSize: 4, ArgDir: 1}}, Kind: 1, RangeEnd: 4},
@@ -23954,42 +23954,42 @@ var structDescs_amd64 = []*KeyedStruct{
 	{Key: StructKey{Name: "sockaddr_l2tp_t[pppol2tp_addr]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "sockaddr_l2tp_t[pppol2tp_addr]", TypeSize: 38}, Fields: []Type{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "sa_family", TypeSize: 2}}, Val: 24},
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "sa_protocol", TypeSize: 4}}, Val: 1},
-		&StructType{Key: StructKey{Name: "pppol2tp_addr"}, FldName: "addr"},
+		&StructType{Key: StructKey{Name: "pppol2tp_addr_t[int16]"}, FldName: "addr"},
 	}}},
 	{Key: StructKey{Name: "sockaddr_l2tp_t[pppol2tp_addr]", Dir: 1}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "sockaddr_l2tp_t[pppol2tp_addr]", TypeSize: 38, ArgDir: 1}, Fields: []Type{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "sa_family", TypeSize: 2, ArgDir: 1}}, Val: 24},
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "sa_protocol", TypeSize: 4, ArgDir: 1}}, Val: 1},
-		&StructType{Key: StructKey{Name: "pppol2tp_addr", Dir: 1}, FldName: "addr"},
+		&StructType{Key: StructKey{Name: "pppol2tp_addr_t[int16]", Dir: 1}, FldName: "addr"},
 	}}},
 	{Key: StructKey{Name: "sockaddr_l2tp_t[pppol2tpin6_addr]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "sockaddr_l2tp_t[pppol2tpin6_addr]", TypeSize: 50}, Fields: []Type{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "sa_family", TypeSize: 2}}, Val: 24},
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "sa_protocol", TypeSize: 4}}, Val: 1},
-		&StructType{Key: StructKey{Name: "pppol2tpin6_addr"}, FldName: "addr"},
+		&StructType{Key: StructKey{Name: "pppol2tpin6_addr_t[int16]"}, FldName: "addr"},
 	}}},
 	{Key: StructKey{Name: "sockaddr_l2tp_t[pppol2tpin6_addr]", Dir: 1}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "sockaddr_l2tp_t[pppol2tpin6_addr]", TypeSize: 50, ArgDir: 1}, Fields: []Type{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "sa_family", TypeSize: 2, ArgDir: 1}}, Val: 24},
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "sa_protocol", TypeSize: 4, ArgDir: 1}}, Val: 1},
-		&StructType{Key: StructKey{Name: "pppol2tpin6_addr", Dir: 1}, FldName: "addr"},
+		&StructType{Key: StructKey{Name: "pppol2tpin6_addr_t[int16]", Dir: 1}, FldName: "addr"},
 	}}},
 	{Key: StructKey{Name: "sockaddr_l2tp_t[pppol2tpv3_addr]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "sockaddr_l2tp_t[pppol2tpv3_addr]", TypeSize: 46}, Fields: []Type{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "sa_family", TypeSize: 2}}, Val: 24},
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "sa_protocol", TypeSize: 4}}, Val: 1},
-		&StructType{Key: StructKey{Name: "pppol2tpv3_addr"}, FldName: "addr"},
+		&StructType{Key: StructKey{Name: "pppol2tp_addr_t[int32]"}, FldName: "addr"},
 	}}},
 	{Key: StructKey{Name: "sockaddr_l2tp_t[pppol2tpv3_addr]", Dir: 1}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "sockaddr_l2tp_t[pppol2tpv3_addr]", TypeSize: 46, ArgDir: 1}, Fields: []Type{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "sa_family", TypeSize: 2, ArgDir: 1}}, Val: 24},
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "sa_protocol", TypeSize: 4, ArgDir: 1}}, Val: 1},
-		&StructType{Key: StructKey{Name: "pppol2tpv3_addr", Dir: 1}, FldName: "addr"},
+		&StructType{Key: StructKey{Name: "pppol2tp_addr_t[int32]", Dir: 1}, FldName: "addr"},
 	}}},
 	{Key: StructKey{Name: "sockaddr_l2tp_t[pppol2tpv3in6_addr]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "sockaddr_l2tp_t[pppol2tpv3in6_addr]", TypeSize: 58}, Fields: []Type{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "sa_family", TypeSize: 2}}, Val: 24},
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "sa_protocol", TypeSize: 4}}, Val: 1},
-		&StructType{Key: StructKey{Name: "pppol2tpv3in6_addr"}, FldName: "addr"},
+		&StructType{Key: StructKey{Name: "pppol2tpin6_addr_t[int32]"}, FldName: "addr"},
 	}}},
 	{Key: StructKey{Name: "sockaddr_l2tp_t[pppol2tpv3in6_addr]", Dir: 1}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "sockaddr_l2tp_t[pppol2tpv3in6_addr]", TypeSize: 58, ArgDir: 1}, Fields: []Type{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "sa_family", TypeSize: 2, ArgDir: 1}}, Val: 24},
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "sa_protocol", TypeSize: 4, ArgDir: 1}}, Val: 1},
-		&StructType{Key: StructKey{Name: "pppol2tpv3in6_addr", Dir: 1}, FldName: "addr"},
+		&StructType{Key: StructKey{Name: "pppol2tpin6_addr_t[int32]", Dir: 1}, FldName: "addr"},
 	}}},
 	{Key: StructKey{Name: "sockaddr_ll"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "sockaddr_ll", TypeSize: 20}, Fields: []Type{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "sll_family", TypeSize: 2}}, Val: 17},
@@ -55934,4 +55934,4 @@ var consts_amd64 = []ConstValue{
 	{Name: "bpf_insn_load_imm_dw", Value: 24},
 }
 
-const revision_amd64 = "dc09e2174b2f26025c7088af97ad1d9e1189ba79"
+const revision_amd64 = "f26e3b3d7200ac7ff3bc0d9b6cb9fe86ebb510ec"
diff --git a/sys/linux/gen/arm.go b/sys/linux/gen/arm.go
index 21c319598..089f06d01 100644
--- a/sys/linux/gen/arm.go
+++ b/sys/linux/gen/arm.go
@@ -20655,7 +20655,7 @@ var structDescs_arm = []*KeyedStruct{
 		&UnionType{Key: StructKey{Name: "mac_addr", Dir: 1}, FldName: "remote"},
 		&BufferType{TypeCommon: TypeCommon{TypeName: "string", FldName: "dev", TypeSize: 16, ArgDir: 1}, Kind: 2, SubKind: "devnames", Values: []string{"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "lo\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "tunl0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "gre0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "gretap0\x00\x00\x00\x00\x00\x00\x00\x00\x00", "ip_vti0\x00\x00\x00\x00\x00\x00\x00\x00\x00", "ip6_vti0\x00\x00\x00\x00\x00\x00\x00\x00", "sit0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "ip6tnl0\x00\x00\x00\x00\x00\x00\x00\x00\x00", "ip6gre0\x00\x00\x00\x00\x00\x00\x00\x00\x00", "ip6gretap0\x00\x00\x00\x00\x00\x00", "bond0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "dummy0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "eql\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "ifb0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "ipddp0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "yam0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "bcsf0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "bcsh0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "teql0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "nr0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "rose0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "irlan0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "erspan0\x00\x00\x00\x00\x00\x00\x00\x00\x00", "bpq0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "vlan0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "bridge0\x00\x00\x00\x00\x00\x00\x00\x00\x00", "vcan0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "team0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "syz_tun\x00\x00\x00\x00\x00\x00\x00\x00\x00", "veth0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "veth1\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "veth0_to_bridge\x00", "veth1_to_bridge\x00", "veth0_to_bond\x00\x00\x00", "veth1_to_bond\x00\x00\x00", "veth0_to_team\x00\x00\x00", "veth1_to_team\x00\x00\x00", "bridge_slave_0\x00\x00", "bridge_slave_1\x00\x00", "bond_slave_0\x00\x00\x00\x00", "bond_slave_1\x00\x00\x00\x00", "team_slave_0\x00\x00\x00\x00", "team_slave_1\x00\x00\x00\x00", "syzkaller0\x00\x00\x00\x00\x00\x00", "syzkaller1\x00\x00\x00\x00\x00\x00", "lapb0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "hwsim0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "rose0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "nr0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "veth0_to_hsr\x00\x00\x00\x00", "veth1_to_hsr\x00\x00\x00\x00", "hsr0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "ip6erspan0\x00\x00\x00\x00\x00\x00", "nlmon0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "vxcan1\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "caif0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "batadv0\x00\x00\x00\x00\x00\x00\x00\x00\x00", "netdevsim0\x00\x00\x00\x00\x00\x00"}},
 	}}},
-	{Key: StructKey{Name: "pppol2tp_addr"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "pppol2tp_addr", TypeSize: 32}, Fields: []Type{
+	{Key: StructKey{Name: "pppol2tp_addr_t[int16]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "pppol2tp_addr_t[int16]", TypeSize: 32}, Fields: []Type{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "pid", TypeSize: 4}}},
 		&ResourceType{TypeCommon: TypeCommon{TypeName: "sock", FldName: "fd", TypeSize: 4}},
 		&StructType{Key: StructKey{Name: "sockaddr_in"}, FldName: "addr"},
@@ -20664,7 +20664,7 @@ var structDescs_arm = []*KeyedStruct{
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "d_tunnel", TypeSize: 2}}, Kind: 1, RangeEnd: 4},
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "d_session", TypeSize: 2}}, Kind: 1, RangeEnd: 4},
 	}}},
-	{Key: StructKey{Name: "pppol2tp_addr", Dir: 1}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "pppol2tp_addr", TypeSize: 32, ArgDir: 1}, Fields: []Type{
+	{Key: StructKey{Name: "pppol2tp_addr_t[int16]", Dir: 1}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "pppol2tp_addr_t[int16]", TypeSize: 32, ArgDir: 1}, Fields: []Type{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "pid", TypeSize: 4, ArgDir: 1}}},
 		&ResourceType{TypeCommon: TypeCommon{TypeName: "sock", FldName: "fd", TypeSize: 4, ArgDir: 1}},
 		&StructType{Key: StructKey{Name: "sockaddr_in", Dir: 1}, FldName: "addr"},
@@ -20673,25 +20673,7 @@ var structDescs_arm = []*KeyedStruct{
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "d_tunnel", TypeSize: 2, ArgDir: 1}}, Kind: 1, RangeEnd: 4},
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "d_session", TypeSize: 2, ArgDir: 1}}, Kind: 1, RangeEnd: 4},
 	}}},
-	{Key: StructKey{Name: "pppol2tpin6_addr"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "pppol2tpin6_addr", TypeSize: 44}, Fields: []Type{
-		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "pid", TypeSize: 4}}},
-		&ResourceType{TypeCommon: TypeCommon{TypeName: "sock", FldName: "fd", TypeSize: 4}},
-		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "s_tunnel", TypeSize: 2}}, Kind: 1, RangeEnd: 4},
-		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "s_session", TypeSize: 2}}, Kind: 1, RangeEnd: 4},
-		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "d_tunnel", TypeSize: 2}}, Kind: 1, RangeEnd: 4},
-		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "d_session", TypeSize: 2}}, Kind: 1, RangeEnd: 4},
-		&StructType{Key: StructKey{Name: "sockaddr_in6"}, FldName: "addr"},
-	}}},
-	{Key: StructKey{Name: "pppol2tpin6_addr", Dir: 1}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "pppol2tpin6_addr", TypeSize: 44, ArgDir: 1}, Fields: []Type{
-		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "pid", TypeSize: 4, ArgDir: 1}}},
-		&ResourceType{TypeCommon: TypeCommon{TypeName: "sock", FldName: "fd", TypeSize: 4, ArgDir: 1}},
-		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "s_tunnel", TypeSize: 2, ArgDir: 1}}, Kind: 1, RangeEnd: 4},
-		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "s_session", TypeSize: 2, ArgDir: 1}}, Kind: 1, RangeEnd: 4},
-		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "d_tunnel", TypeSize: 2, ArgDir: 1}}, Kind: 1, RangeEnd: 4},
-		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "d_session", TypeSize: 2, ArgDir: 1}}, Kind: 1, RangeEnd: 4},
-		&StructType{Key: StructKey{Name: "sockaddr_in6", Dir: 1}, FldName: "addr"},
-	}}},
-	{Key: StructKey{Name: "pppol2tpv3_addr"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "pppol2tpv3_addr", TypeSize: 40}, Fields: []Type{
+	{Key: StructKey{Name: "pppol2tp_addr_t[int32]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "pppol2tp_addr_t[int32]", TypeSize: 40}, Fields: []Type{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "pid", TypeSize: 4}}},
 		&ResourceType{TypeCommon: TypeCommon{TypeName: "sock", FldName: "fd", TypeSize: 4}},
 		&StructType{Key: StructKey{Name: "sockaddr_in"}, FldName: "addr"},
@@ -20700,7 +20682,7 @@ var structDescs_arm = []*KeyedStruct{
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "d_tunnel", TypeSize: 4}}, Kind: 1, RangeEnd: 4},
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "d_session", TypeSize: 4}}, Kind: 1, RangeEnd: 4},
 	}}},
-	{Key: StructKey{Name: "pppol2tpv3_addr", Dir: 1}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "pppol2tpv3_addr", TypeSize: 40, ArgDir: 1}, Fields: []Type{
+	{Key: StructKey{Name: "pppol2tp_addr_t[int32]", Dir: 1}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "pppol2tp_addr_t[int32]", TypeSize: 40, ArgDir: 1}, Fields: []Type{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "pid", TypeSize: 4, ArgDir: 1}}},
 		&ResourceType{TypeCommon: TypeCommon{TypeName: "sock", FldName: "fd", TypeSize: 4, ArgDir: 1}},
 		&StructType{Key: StructKey{Name: "sockaddr_in", Dir: 1}, FldName: "addr"},
@@ -20709,7 +20691,25 @@ var structDescs_arm = []*KeyedStruct{
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "d_tunnel", TypeSize: 4, ArgDir: 1}}, Kind: 1, RangeEnd: 4},
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "d_session", TypeSize: 4, ArgDir: 1}}, Kind: 1, RangeEnd: 4},
 	}}},
-	{Key: StructKey{Name: "pppol2tpv3in6_addr"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "pppol2tpv3in6_addr", TypeSize: 52}, Fields: []Type{
+	{Key: StructKey{Name: "pppol2tpin6_addr_t[int16]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "pppol2tpin6_addr_t[int16]", TypeSize: 44}, Fields: []Type{
+		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "pid", TypeSize: 4}}},
+		&ResourceType{TypeCommon: TypeCommon{TypeName: "sock", FldName: "fd", TypeSize: 4}},
+		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "s_tunnel", TypeSize: 2}}, Kind: 1, RangeEnd: 4},
+		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "s_session", TypeSize: 2}}, Kind: 1, RangeEnd: 4},
+		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "d_tunnel", TypeSize: 2}}, Kind: 1, RangeEnd: 4},
+		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "d_session", TypeSize: 2}}, Kind: 1, RangeEnd: 4},
+		&StructType{Key: StructKey{Name: "sockaddr_in6"}, FldName: "addr"},
+	}}},
+	{Key: StructKey{Name: "pppol2tpin6_addr_t[int16]", Dir: 1}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "pppol2tpin6_addr_t[int16]", TypeSize: 44, ArgDir: 1}, Fields: []Type{
+		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "pid", TypeSize: 4, ArgDir: 1}}},
+		&ResourceType{TypeCommon: TypeCommon{TypeName: "sock", FldName: "fd", TypeSize: 4, ArgDir: 1}},
+		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "s_tunnel", TypeSize: 2, ArgDir: 1}}, Kind: 1, RangeEnd: 4},
+		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "s_session", TypeSize: 2, ArgDir: 1}}, Kind: 1, RangeEnd: 4},
+		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "d_tunnel", TypeSize: 2, ArgDir: 1}}, Kind: 1, RangeEnd: 4},
+		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "d_session", TypeSize: 2, ArgDir: 1}}, Kind: 1, RangeEnd: 4},
+		&StructType{Key: StructKey{Name: "sockaddr_in6", Dir: 1}, FldName: "addr"},
+	}}},
+	{Key: StructKey{Name: "pppol2tpin6_addr_t[int32]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "pppol2tpin6_addr_t[int32]", TypeSize: 52}, Fields: []Type{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "pid", TypeSize: 4}}},
 		&ResourceType{TypeCommon: TypeCommon{TypeName: "sock", FldName: "fd", TypeSize: 4}},
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "s_tunnel", TypeSize: 4}}, Kind: 1, RangeEnd: 4},
@@ -20718,7 +20718,7 @@ var structDescs_arm = []*KeyedStruct{
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "d_session", TypeSize: 4}}, Kind: 1, RangeEnd: 4},
 		&StructType{Key: StructKey{Name: "sockaddr_in6"}, FldName: "addr"},
 	}}},
-	{Key: StructKey{Name: "pppol2tpv3in6_addr", Dir: 1}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "pppol2tpv3in6_addr", TypeSize: 52, ArgDir: 1}, Fields: []Type{
+	{Key: StructKey{Name: "pppol2tpin6_addr_t[int32]", Dir: 1}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "pppol2tpin6_addr_t[int32]", TypeSize: 52, ArgDir: 1}, Fields: []Type{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "pid", TypeSize: 4, ArgDir: 1}}},
 		&ResourceType{TypeCommon: TypeCommon{TypeName: "sock", FldName: "fd", TypeSize: 4, ArgDir: 1}},
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "s_tunnel", TypeSize: 4, ArgDir: 1}}, Kind: 1, RangeEnd: 4},
@@ -23423,42 +23423,42 @@ var structDescs_arm = []*KeyedStruct{
 	{Key: StructKey{Name: "sockaddr_l2tp_t[pppol2tp_addr]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "sockaddr_l2tp_t[pppol2tp_addr]", TypeSize: 38}, Fields: []Type{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "sa_family", TypeSize: 2}}, Val: 24},
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "sa_protocol", TypeSize: 4}}, Val: 1},
-		&StructType{Key: StructKey{Name: "pppol2tp_addr"}, FldName: "addr"},
+		&StructType{Key: StructKey{Name: "pppol2tp_addr_t[int16]"}, FldName: "addr"},
 	}}},
 	{Key: StructKey{Name: "sockaddr_l2tp_t[pppol2tp_addr]", Dir: 1}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "sockaddr_l2tp_t[pppol2tp_addr]", TypeSize: 38, ArgDir: 1}, Fields: []Type{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "sa_family", TypeSize: 2, ArgDir: 1}}, Val: 24},
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "sa_protocol", TypeSize: 4, ArgDir: 1}}, Val: 1},
-		&StructType{Key: StructKey{Name: "pppol2tp_addr", Dir: 1}, FldName: "addr"},
+		&StructType{Key: StructKey{Name: "pppol2tp_addr_t[int16]", Dir: 1}, FldName: "addr"},
 	}}},
 	{Key: StructKey{Name: "sockaddr_l2tp_t[pppol2tpin6_addr]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "sockaddr_l2tp_t[pppol2tpin6_addr]", TypeSize: 50}, Fields: []Type{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "sa_family", TypeSize: 2}}, Val: 24},
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "sa_protocol", TypeSize: 4}}, Val: 1},
-		&StructType{Key: StructKey{Name: "pppol2tpin6_addr"}, FldName: "addr"},
+		&StructType{Key: StructKey{Name: "pppol2tpin6_addr_t[int16]"}, FldName: "addr"},
 	}}},
 	{Key: StructKey{Name: "sockaddr_l2tp_t[pppol2tpin6_addr]", Dir: 1}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "sockaddr_l2tp_t[pppol2tpin6_addr]", TypeSize: 50, ArgDir: 1}, Fields: []Type{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "sa_family", TypeSize: 2, ArgDir: 1}}, Val: 24},
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "sa_protocol", TypeSize: 4, ArgDir: 1}}, Val: 1},
-		&StructType{Key: StructKey{Name: "pppol2tpin6_addr", Dir: 1}, FldName: "addr"},
+		&StructType{Key: StructKey{Name: "pppol2tpin6_addr_t[int16]", Dir: 1}, FldName: "addr"},
 	}}},
 	{Key: StructKey{Name: "sockaddr_l2tp_t[pppol2tpv3_addr]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "sockaddr_l2tp_t[pppol2tpv3_addr]", TypeSize: 46}, Fields: []Type{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "sa_family", TypeSize: 2}}, Val: 24},
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "sa_protocol", TypeSize: 4}}, Val: 1},
-		&StructType{Key: StructKey{Name: "pppol2tpv3_addr"}, FldName: "addr"},
+		&StructType{Key: StructKey{Name: "pppol2tp_addr_t[int32]"}, FldName: "addr"},
 	}}},
 	{Key: StructKey{Name: "sockaddr_l2tp_t[pppol2tpv3_addr]", Dir: 1}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "sockaddr_l2tp_t[pppol2tpv3_addr]", TypeSize: 46, ArgDir: 1}, Fields: []Type{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "sa_family", TypeSize: 2, ArgDir: 1}}, Val: 24},
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "sa_protocol", TypeSize: 4, ArgDir: 1}}, Val: 1},
-		&StructType{Key: StructKey{Name: "pppol2tpv3_addr", Dir: 1}, FldName: "addr"},
+		&StructType{Key: StructKey{Name: "pppol2tp_addr_t[int32]", Dir: 1}, FldName: "addr"},
 	}}},
 	{Key: StructKey{Name: "sockaddr_l2tp_t[pppol2tpv3in6_addr]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "sockaddr_l2tp_t[pppol2tpv3in6_addr]", TypeSize: 58}, Fields: []Type{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "sa_family", TypeSize: 2}}, Val: 24},
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "sa_protocol", TypeSize: 4}}, Val: 1},
-		&StructType{Key: StructKey{Name: "pppol2tpv3in6_addr"}, FldName: "addr"},
+		&StructType{Key: StructKey{Name: "pppol2tpin6_addr_t[int32]"}, FldName: "addr"},
 	}}},
 	{Key: StructKey{Name: "sockaddr_l2tp_t[pppol2tpv3in6_addr]", Dir: 1}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "sockaddr_l2tp_t[pppol2tpv3in6_addr]", TypeSize: 58, ArgDir: 1}, Fields: []Type{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "sa_family", TypeSize: 2, ArgDir: 1}}, Val: 24},
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "sa_protocol", TypeSize: 4, ArgDir: 1}}, Val: 1},
-		&StructType{Key: StructKey{Name: "pppol2tpv3in6_addr", Dir: 1}, FldName: "addr"},
+		&StructType{Key: StructKey{Name: "pppol2tpin6_addr_t[int32]", Dir: 1}, FldName: "addr"},
 	}}},
 	{Key: StructKey{Name: "sockaddr_ll"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "sockaddr_ll", TypeSize: 20}, Fields: []Type{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "sll_family", TypeSize: 2}}, Val: 17},
@@ -54899,4 +54899,4 @@ var consts_arm = []ConstValue{
 	{Name: "bpf_insn_load_imm_dw", Value: 24},
 }
 
-const revision_arm = "fbc8c2ff6f26581de7ce375f585f105fc8442b21"
+const revision_arm = "7288b49cb57aa73df7a305b56185a04032a3c05d"
diff --git a/sys/linux/gen/arm64.go b/sys/linux/gen/arm64.go
index 86b52cc75..3410082ef 100644
--- a/sys/linux/gen/arm64.go
+++ b/sys/linux/gen/arm64.go
@@ -20961,7 +20961,7 @@ var structDescs_arm64 = []*KeyedStruct{
 		&UnionType{Key: StructKey{Name: "mac_addr", Dir: 1}, FldName: "remote"},
 		&BufferType{TypeCommon: TypeCommon{TypeName: "string", FldName: "dev", TypeSize: 16, ArgDir: 1}, Kind: 2, SubKind: "devnames", Values: []string{"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "lo\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "tunl0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "gre0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "gretap0\x00\x00\x00\x00\x00\x00\x00\x00\x00", "ip_vti0\x00\x00\x00\x00\x00\x00\x00\x00\x00", "ip6_vti0\x00\x00\x00\x00\x00\x00\x00\x00", "sit0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "ip6tnl0\x00\x00\x00\x00\x00\x00\x00\x00\x00", "ip6gre0\x00\x00\x00\x00\x00\x00\x00\x00\x00", "ip6gretap0\x00\x00\x00\x00\x00\x00", "bond0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "dummy0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "eql\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "ifb0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "ipddp0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "yam0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "bcsf0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "bcsh0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "teql0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "nr0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "rose0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "irlan0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "erspan0\x00\x00\x00\x00\x00\x00\x00\x00\x00", "bpq0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "vlan0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "bridge0\x00\x00\x00\x00\x00\x00\x00\x00\x00", "vcan0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "team0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "syz_tun\x00\x00\x00\x00\x00\x00\x00\x00\x00", "veth0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "veth1\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "veth0_to_bridge\x00", "veth1_to_bridge\x00", "veth0_to_bond\x00\x00\x00", "veth1_to_bond\x00\x00\x00", "veth0_to_team\x00\x00\x00", "veth1_to_team\x00\x00\x00", "bridge_slave_0\x00\x00", "bridge_slave_1\x00\x00", "bond_slave_0\x00\x00\x00\x00", "bond_slave_1\x00\x00\x00\x00", "team_slave_0\x00\x00\x00\x00", "team_slave_1\x00\x00\x00\x00", "syzkaller0\x00\x00\x00\x00\x00\x00", "syzkaller1\x00\x00\x00\x00\x00\x00", "lapb0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "hwsim0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "rose0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "nr0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "veth0_to_hsr\x00\x00\x00\x00", "veth1_to_hsr\x00\x00\x00\x00", "hsr0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "ip6erspan0\x00\x00\x00\x00\x00\x00", "nlmon0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "vxcan1\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "caif0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "batadv0\x00\x00\x00\x00\x00\x00\x00\x00\x00", "netdevsim0\x00\x00\x00\x00\x00\x00"}},
 	}}},
-	{Key: StructKey{Name: "pppol2tp_addr"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "pppol2tp_addr", TypeSize: 32}, Fields: []Type{
+	{Key: StructKey{Name: "pppol2tp_addr_t[int16]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "pppol2tp_addr_t[int16]", TypeSize: 32}, Fields: []Type{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "pid", TypeSize: 4}}},
 		&ResourceType{TypeCommon: TypeCommon{TypeName: "sock", FldName: "fd", TypeSize: 4}},
 		&StructType{Key: StructKey{Name: "sockaddr_in"}, FldName: "addr"},
@@ -20970,7 +20970,7 @@ var structDescs_arm64 = []*KeyedStruct{
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "d_tunnel", TypeSize: 2}}, Kind: 1, RangeEnd: 4},
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "d_session", TypeSize: 2}}, Kind: 1, RangeEnd: 4},
 	}}},
-	{Key: StructKey{Name: "pppol2tp_addr", Dir: 1}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "pppol2tp_addr", TypeSize: 32, ArgDir: 1}, Fields: []Type{
+	{Key: StructKey{Name: "pppol2tp_addr_t[int16]", Dir: 1}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "pppol2tp_addr_t[int16]", TypeSize: 32, ArgDir: 1}, Fields: []Type{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "pid", TypeSize: 4, ArgDir: 1}}},
 		&ResourceType{TypeCommon: TypeCommon{TypeName: "sock", FldName: "fd", TypeSize: 4, ArgDir: 1}},
 		&StructType{Key: StructKey{Name: "sockaddr_in", Dir: 1}, FldName: "addr"},
@@ -20979,25 +20979,7 @@ var structDescs_arm64 = []*KeyedStruct{
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "d_tunnel", TypeSize: 2, ArgDir: 1}}, Kind: 1, RangeEnd: 4},
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "d_session", TypeSize: 2, ArgDir: 1}}, Kind: 1, RangeEnd: 4},
 	}}},
-	{Key: StructKey{Name: "pppol2tpin6_addr"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "pppol2tpin6_addr", TypeSize: 44}, Fields: []Type{
-		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "pid", TypeSize: 4}}},
-		&ResourceType{TypeCommon: TypeCommon{TypeName: "sock", FldName: "fd", TypeSize: 4}},
-		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "s_tunnel", TypeSize: 2}}, Kind: 1, RangeEnd: 4},
-		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "s_session", TypeSize: 2}}, Kind: 1, RangeEnd: 4},
-		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "d_tunnel", TypeSize: 2}}, Kind: 1, RangeEnd: 4},
-		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "d_session", TypeSize: 2}}, Kind: 1, RangeEnd: 4},
-		&StructType{Key: StructKey{Name: "sockaddr_in6"}, FldName: "addr"},
-	}}},
-	{Key: StructKey{Name: "pppol2tpin6_addr", Dir: 1}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "pppol2tpin6_addr", TypeSize: 44, ArgDir: 1}, Fields: []Type{
-		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "pid", TypeSize: 4, ArgDir: 1}}},
-		&ResourceType{TypeCommon: TypeCommon{TypeName: "sock", FldName: "fd", TypeSize: 4, ArgDir: 1}},
-		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "s_tunnel", TypeSize: 2, ArgDir: 1}}, Kind: 1, RangeEnd: 4},
-		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "s_session", TypeSize: 2, ArgDir: 1}}, Kind: 1, RangeEnd: 4},
-		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "d_tunnel", TypeSize: 2, ArgDir: 1}}, Kind: 1, RangeEnd: 4},
-		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "d_session", TypeSize: 2, ArgDir: 1}}, Kind: 1, RangeEnd: 4},
-		&StructType{Key: StructKey{Name: "sockaddr_in6", Dir: 1}, FldName: "addr"},
-	}}},
-	{Key: StructKey{Name: "pppol2tpv3_addr"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "pppol2tpv3_addr", TypeSize: 40}, Fields: []Type{
+	{Key: StructKey{Name: "pppol2tp_addr_t[int32]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "pppol2tp_addr_t[int32]", TypeSize: 40}, Fields: []Type{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "pid", TypeSize: 4}}},
 		&ResourceType{TypeCommon: TypeCommon{TypeName: "sock", FldName: "fd", TypeSize: 4}},
 		&StructType{Key: StructKey{Name: "sockaddr_in"}, FldName: "addr"},
@@ -21006,7 +20988,7 @@ var structDescs_arm64 = []*KeyedStruct{
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "d_tunnel", TypeSize: 4}}, Kind: 1, RangeEnd: 4},
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "d_session", TypeSize: 4}}, Kind: 1, RangeEnd: 4},
 	}}},
-	{Key: StructKey{Name: "pppol2tpv3_addr", Dir: 1}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "pppol2tpv3_addr", TypeSize: 40, ArgDir: 1}, Fields: []Type{
+	{Key: StructKey{Name: "pppol2tp_addr_t[int32]", Dir: 1}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "pppol2tp_addr_t[int32]", TypeSize: 40, ArgDir: 1}, Fields: []Type{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "pid", TypeSize: 4, ArgDir: 1}}},
 		&ResourceType{TypeCommon: TypeCommon{TypeName: "sock", FldName: "fd", TypeSize: 4, ArgDir: 1}},
 		&StructType{Key: StructKey{Name: "sockaddr_in", Dir: 1}, FldName: "addr"},
@@ -21015,7 +20997,25 @@ var structDescs_arm64 = []*KeyedStruct{
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "d_tunnel", TypeSize: 4, ArgDir: 1}}, Kind: 1, RangeEnd: 4},
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "d_session", TypeSize: 4, ArgDir: 1}}, Kind: 1, RangeEnd: 4},
 	}}},
-	{Key: StructKey{Name: "pppol2tpv3in6_addr"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "pppol2tpv3in6_addr", TypeSize: 52}, Fields: []Type{
+	{Key: StructKey{Name: "pppol2tpin6_addr_t[int16]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "pppol2tpin6_addr_t[int16]", TypeSize: 44}, Fields: []Type{
+		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "pid", TypeSize: 4}}},
+		&ResourceType{TypeCommon: TypeCommon{TypeName: "sock", FldName: "fd", TypeSize: 4}},
+		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "s_tunnel", TypeSize: 2}}, Kind: 1, RangeEnd: 4},
+		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "s_session", TypeSize: 2}}, Kind: 1, RangeEnd: 4},
+		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "d_tunnel", TypeSize: 2}}, Kind: 1, RangeEnd: 4},
+		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "d_session", TypeSize: 2}}, Kind: 1, RangeEnd: 4},
+		&StructType{Key: StructKey{Name: "sockaddr_in6"}, FldName: "addr"},
+	}}},
+	{Key: StructKey{Name: "pppol2tpin6_addr_t[int16]", Dir: 1}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "pppol2tpin6_addr_t[int16]", TypeSize: 44, ArgDir: 1}, Fields: []Type{
+		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "pid", TypeSize: 4, ArgDir: 1}}},
+		&ResourceType{TypeCommon: TypeCommon{TypeName: "sock", FldName: "fd", TypeSize: 4, ArgDir: 1}},
+		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "s_tunnel", TypeSize: 2, ArgDir: 1}}, Kind: 1, RangeEnd: 4},
+		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "s_session", TypeSize: 2, ArgDir: 1}}, Kind: 1, RangeEnd: 4},
+		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "d_tunnel", TypeSize: 2, ArgDir: 1}}, Kind: 1, RangeEnd: 4},
+		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "d_session", TypeSize: 2, ArgDir: 1}}, Kind: 1, RangeEnd: 4},
+		&StructType{Key: StructKey{Name: "sockaddr_in6", Dir: 1}, FldName: "addr"},
+	}}},
+	{Key: StructKey{Name: "pppol2tpin6_addr_t[int32]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "pppol2tpin6_addr_t[int32]", TypeSize: 52}, Fields: []Type{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "pid", TypeSize: 4}}},
 		&ResourceType{TypeCommon: TypeCommon{TypeName: "sock", FldName: "fd", TypeSize: 4}},
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "s_tunnel", TypeSize: 4}}, Kind: 1, RangeEnd: 4},
@@ -21024,7 +21024,7 @@ var structDescs_arm64 = []*KeyedStruct{
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "d_session", TypeSize: 4}}, Kind: 1, RangeEnd: 4},
 		&StructType{Key: StructKey{Name: "sockaddr_in6"}, FldName: "addr"},
 	}}},
-	{Key: StructKey{Name: "pppol2tpv3in6_addr", Dir: 1}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "pppol2tpv3in6_addr", TypeSize: 52, ArgDir: 1}, Fields: []Type{
+	{Key: StructKey{Name: "pppol2tpin6_addr_t[int32]", Dir: 1}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "pppol2tpin6_addr_t[int32]", TypeSize: 52, ArgDir: 1}, Fields: []Type{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "pid", TypeSize: 4, ArgDir: 1}}},
 		&ResourceType{TypeCommon: TypeCommon{TypeName: "sock", FldName: "fd", TypeSize: 4, ArgDir: 1}},
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "s_tunnel", TypeSize: 4, ArgDir: 1}}, Kind: 1, RangeEnd: 4},
@@ -23771,42 +23771,42 @@ var structDescs_arm64 = []*KeyedStruct{
 	{Key: StructKey{Name: "sockaddr_l2tp_t[pppol2tp_addr]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "sockaddr_l2tp_t[pppol2tp_addr]", TypeSize: 38}, Fields: []Type{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "sa_family", TypeSize: 2}}, Val: 24},
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "sa_protocol", TypeSize: 4}}, Val: 1},
-		&StructType{Key: StructKey{Name: "pppol2tp_addr"}, FldName: "addr"},
+		&StructType{Key: StructKey{Name: "pppol2tp_addr_t[int16]"}, FldName: "addr"},
 	}}},
 	{Key: StructKey{Name: "sockaddr_l2tp_t[pppol2tp_addr]", Dir: 1}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "sockaddr_l2tp_t[pppol2tp_addr]", TypeSize: 38, ArgDir: 1}, Fields: []Type{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "sa_family", TypeSize: 2, ArgDir: 1}}, Val: 24},
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "sa_protocol", TypeSize: 4, ArgDir: 1}}, Val: 1},
-		&StructType{Key: StructKey{Name: "pppol2tp_addr", Dir: 1}, FldName: "addr"},
+		&StructType{Key: StructKey{Name: "pppol2tp_addr_t[int16]", Dir: 1}, FldName: "addr"},
 	}}},
 	{Key: StructKey{Name: "sockaddr_l2tp_t[pppol2tpin6_addr]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "sockaddr_l2tp_t[pppol2tpin6_addr]", TypeSize: 50}, Fields: []Type{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "sa_family", TypeSize: 2}}, Val: 24},
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "sa_protocol", TypeSize: 4}}, Val: 1},
-		&StructType{Key: StructKey{Name: "pppol2tpin6_addr"}, FldName: "addr"},
+		&StructType{Key: StructKey{Name: "pppol2tpin6_addr_t[int16]"}, FldName: "addr"},
 	}}},
 	{Key: StructKey{Name: "sockaddr_l2tp_t[pppol2tpin6_addr]", Dir: 1}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "sockaddr_l2tp_t[pppol2tpin6_addr]", TypeSize: 50, ArgDir: 1}, Fields: []Type{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "sa_family", TypeSize: 2, ArgDir: 1}}, Val: 24},
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "sa_protocol", TypeSize: 4, ArgDir: 1}}, Val: 1},
-		&StructType{Key: StructKey{Name: "pppol2tpin6_addr", Dir: 1}, FldName: "addr"},
+		&StructType{Key: StructKey{Name: "pppol2tpin6_addr_t[int16]", Dir: 1}, FldName: "addr"},
 	}}},
 	{Key: StructKey{Name: "sockaddr_l2tp_t[pppol2tpv3_addr]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "sockaddr_l2tp_t[pppol2tpv3_addr]", TypeSize: 46}, Fields: []Type{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "sa_family", TypeSize: 2}}, Val: 24},
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "sa_protocol", TypeSize: 4}}, Val: 1},
-		&StructType{Key: StructKey{Name: "pppol2tpv3_addr"}, FldName: "addr"},
+		&StructType{Key: StructKey{Name: "pppol2tp_addr_t[int32]"}, FldName: "addr"},
 	}}},
 	{Key: StructKey{Name: "sockaddr_l2tp_t[pppol2tpv3_addr]", Dir: 1}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "sockaddr_l2tp_t[pppol2tpv3_addr]", TypeSize: 46, ArgDir: 1}, Fields: []Type{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "sa_family", TypeSize: 2, ArgDir: 1}}, Val: 24},
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "sa_protocol", TypeSize: 4, ArgDir: 1}}, Val: 1},
-		&StructType{Key: StructKey{Name: "pppol2tpv3_addr", Dir: 1}, FldName: "addr"},
+		&StructType{Key: StructKey{Name: "pppol2tp_addr_t[int32]", Dir: 1}, FldName: "addr"},
 	}}},
 	{Key: StructKey{Name: "sockaddr_l2tp_t[pppol2tpv3in6_addr]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "sockaddr_l2tp_t[pppol2tpv3in6_addr]", TypeSize: 58}, Fields: []Type{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "sa_family", TypeSize: 2}}, Val: 24},
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "sa_protocol", TypeSize: 4}}, Val: 1},
-		&StructType{Key: StructKey{Name: "pppol2tpv3in6_addr"}, FldName: "addr"},
+		&StructType{Key: StructKey{Name: "pppol2tpin6_addr_t[int32]"}, FldName: "addr"},
 	}}},
 	{Key: StructKey{Name: "sockaddr_l2tp_t[pppol2tpv3in6_addr]", Dir: 1}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "sockaddr_l2tp_t[pppol2tpv3in6_addr]", TypeSize: 58, ArgDir: 1}, Fields: []Type{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "sa_family", TypeSize: 2, ArgDir: 1}}, Val: 24},
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "sa_protocol", TypeSize: 4, ArgDir: 1}}, Val: 1},
-		&StructType{Key: StructKey{Name: "pppol2tpv3in6_addr", Dir: 1}, FldName: "addr"},
+		&StructType{Key: StructKey{Name: "pppol2tpin6_addr_t[int32]", Dir: 1}, FldName: "addr"},
 	}}},
 	{Key: StructKey{Name: "sockaddr_ll"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "sockaddr_ll", TypeSize: 20}, Fields: []Type{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "sll_family", TypeSize: 2}}, Val: 17},
@@ -55286,4 +55286,4 @@ var consts_arm64 = []ConstValue{
 	{Name: "bpf_insn_load_imm_dw", Value: 24},
 }
 
-const revision_arm64 = "91a429dff882d0b26701ebce50d7c967fdb16c90"
+const revision_arm64 = "e78eec2b0bdf50382e202fc0cbf41f8799885318"
diff --git a/sys/linux/gen/ppc64le.go b/sys/linux/gen/ppc64le.go
index 4a2d1ce5c..e72683426 100644
--- a/sys/linux/gen/ppc64le.go
+++ b/sys/linux/gen/ppc64le.go
@@ -20913,7 +20913,7 @@ var structDescs_ppc64le = []*KeyedStruct{
 		&UnionType{Key: StructKey{Name: "mac_addr", Dir: 1}, FldName: "remote"},
 		&BufferType{TypeCommon: TypeCommon{TypeName: "string", FldName: "dev", TypeSize: 16, ArgDir: 1}, Kind: 2, SubKind: "devnames", Values: []string{"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "lo\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "tunl0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "gre0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "gretap0\x00\x00\x00\x00\x00\x00\x00\x00\x00", "ip_vti0\x00\x00\x00\x00\x00\x00\x00\x00\x00", "ip6_vti0\x00\x00\x00\x00\x00\x00\x00\x00", "sit0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "ip6tnl0\x00\x00\x00\x00\x00\x00\x00\x00\x00", "ip6gre0\x00\x00\x00\x00\x00\x00\x00\x00\x00", "ip6gretap0\x00\x00\x00\x00\x00\x00", "bond0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "dummy0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "eql\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "ifb0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "ipddp0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "yam0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "bcsf0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "bcsh0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "teql0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "nr0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "rose0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "irlan0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "erspan0\x00\x00\x00\x00\x00\x00\x00\x00\x00", "bpq0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "vlan0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "bridge0\x00\x00\x00\x00\x00\x00\x00\x00\x00", "vcan0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "team0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "syz_tun\x00\x00\x00\x00\x00\x00\x00\x00\x00", "veth0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "veth1\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "veth0_to_bridge\x00", "veth1_to_bridge\x00", "veth0_to_bond\x00\x00\x00", "veth1_to_bond\x00\x00\x00", "veth0_to_team\x00\x00\x00", "veth1_to_team\x00\x00\x00", "bridge_slave_0\x00\x00", "bridge_slave_1\x00\x00", "bond_slave_0\x00\x00\x00\x00", "bond_slave_1\x00\x00\x00\x00", "team_slave_0\x00\x00\x00\x00", "team_slave_1\x00\x00\x00\x00", "syzkaller0\x00\x00\x00\x00\x00\x00", "syzkaller1\x00\x00\x00\x00\x00\x00", "lapb0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "hwsim0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "rose0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "nr0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "veth0_to_hsr\x00\x00\x00\x00", "veth1_to_hsr\x00\x00\x00\x00", "hsr0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "ip6erspan0\x00\x00\x00\x00\x00\x00", "nlmon0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "vxcan1\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "caif0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "batadv0\x00\x00\x00\x00\x00\x00\x00\x00\x00", "netdevsim0\x00\x00\x00\x00\x00\x00"}},
 	}}},
-	{Key: StructKey{Name: "pppol2tp_addr"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "pppol2tp_addr", TypeSize: 32}, Fields: []Type{
+	{Key: StructKey{Name: "pppol2tp_addr_t[int16]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "pppol2tp_addr_t[int16]", TypeSize: 32}, Fields: []Type{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "pid", TypeSize: 4}}},
 		&ResourceType{TypeCommon: TypeCommon{TypeName: "sock", FldName: "fd", TypeSize: 4}},
 		&StructType{Key: StructKey{Name: "sockaddr_in"}, FldName: "addr"},
@@ -20922,7 +20922,7 @@ var structDescs_ppc64le = []*KeyedStruct{
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "d_tunnel", TypeSize: 2}}, Kind: 1, RangeEnd: 4},
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "d_session", TypeSize: 2}}, Kind: 1, RangeEnd: 4},
 	}}},
-	{Key: StructKey{Name: "pppol2tp_addr", Dir: 1}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "pppol2tp_addr", TypeSize: 32, ArgDir: 1}, Fields: []Type{
+	{Key: StructKey{Name: "pppol2tp_addr_t[int16]", Dir: 1}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "pppol2tp_addr_t[int16]", TypeSize: 32, ArgDir: 1}, Fields: []Type{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "pid", TypeSize: 4, ArgDir: 1}}},
 		&ResourceType{TypeCommon: TypeCommon{TypeName: "sock", FldName: "fd", TypeSize: 4, ArgDir: 1}},
 		&StructType{Key: StructKey{Name: "sockaddr_in", Dir: 1}, FldName: "addr"},
@@ -20931,25 +20931,7 @@ var structDescs_ppc64le = []*KeyedStruct{
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "d_tunnel", TypeSize: 2, ArgDir: 1}}, Kind: 1, RangeEnd: 4},
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "d_session", TypeSize: 2, ArgDir: 1}}, Kind: 1, RangeEnd: 4},
 	}}},
-	{Key: StructKey{Name: "pppol2tpin6_addr"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "pppol2tpin6_addr", TypeSize: 44}, Fields: []Type{
-		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "pid", TypeSize: 4}}},
-		&ResourceType{TypeCommon: TypeCommon{TypeName: "sock", FldName: "fd", TypeSize: 4}},
-		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "s_tunnel", TypeSize: 2}}, Kind: 1, RangeEnd: 4},
-		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "s_session", TypeSize: 2}}, Kind: 1, RangeEnd: 4},
-		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "d_tunnel", TypeSize: 2}}, Kind: 1, RangeEnd: 4},
-		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "d_session", TypeSize: 2}}, Kind: 1, RangeEnd: 4},
-		&StructType{Key: StructKey{Name: "sockaddr_in6"}, FldName: "addr"},
-	}}},
-	{Key: StructKey{Name: "pppol2tpin6_addr", Dir: 1}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "pppol2tpin6_addr", TypeSize: 44, ArgDir: 1}, Fields: []Type{
-		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "pid", TypeSize: 4, ArgDir: 1}}},
-		&ResourceType{TypeCommon: TypeCommon{TypeName: "sock", FldName: "fd", TypeSize: 4, ArgDir: 1}},
-		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "s_tunnel", TypeSize: 2, ArgDir: 1}}, Kind: 1, RangeEnd: 4},
-		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "s_session", TypeSize: 2, ArgDir: 1}}, Kind: 1, RangeEnd: 4},
-		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "d_tunnel", TypeSize: 2, ArgDir: 1}}, Kind: 1, RangeEnd: 4},
-		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "d_session", TypeSize: 2, ArgDir: 1}}, Kind: 1, RangeEnd: 4},
-		&StructType{Key: StructKey{Name: "sockaddr_in6", Dir: 1}, FldName: "addr"},
-	}}},
-	{Key: StructKey{Name: "pppol2tpv3_addr"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "pppol2tpv3_addr", TypeSize: 40}, Fields: []Type{
+	{Key: StructKey{Name: "pppol2tp_addr_t[int32]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "pppol2tp_addr_t[int32]", TypeSize: 40}, Fields: []Type{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "pid", TypeSize: 4}}},
 		&ResourceType{TypeCommon: TypeCommon{TypeName: "sock", FldName: "fd", TypeSize: 4}},
 		&StructType{Key: StructKey{Name: "sockaddr_in"}, FldName: "addr"},
@@ -20958,7 +20940,7 @@ var structDescs_ppc64le = []*KeyedStruct{
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "d_tunnel", TypeSize: 4}}, Kind: 1, RangeEnd: 4},
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "d_session", TypeSize: 4}}, Kind: 1, RangeEnd: 4},
 	}}},
-	{Key: StructKey{Name: "pppol2tpv3_addr", Dir: 1}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "pppol2tpv3_addr", TypeSize: 40, ArgDir: 1}, Fields: []Type{
+	{Key: StructKey{Name: "pppol2tp_addr_t[int32]", Dir: 1}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "pppol2tp_addr_t[int32]", TypeSize: 40, ArgDir: 1}, Fields: []Type{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "pid", TypeSize: 4, ArgDir: 1}}},
 		&ResourceType{TypeCommon: TypeCommon{TypeName: "sock", FldName: "fd", TypeSize: 4, ArgDir: 1}},
 		&StructType{Key: StructKey{Name: "sockaddr_in", Dir: 1}, FldName: "addr"},
@@ -20967,7 +20949,25 @@ var structDescs_ppc64le = []*KeyedStruct{
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "d_tunnel", TypeSize: 4, ArgDir: 1}}, Kind: 1, RangeEnd: 4},
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "d_session", TypeSize: 4, ArgDir: 1}}, Kind: 1, RangeEnd: 4},
 	}}},
-	{Key: StructKey{Name: "pppol2tpv3in6_addr"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "pppol2tpv3in6_addr", TypeSize: 52}, Fields: []Type{
+	{Key: StructKey{Name: "pppol2tpin6_addr_t[int16]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "pppol2tpin6_addr_t[int16]", TypeSize: 44}, Fields: []Type{
+		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "pid", TypeSize: 4}}},
+		&ResourceType{TypeCommon: TypeCommon{TypeName: "sock", FldName: "fd", TypeSize: 4}},
+		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "s_tunnel", TypeSize: 2}}, Kind: 1, RangeEnd: 4},
+		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "s_session", TypeSize: 2}}, Kind: 1, RangeEnd: 4},
+		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "d_tunnel", TypeSize: 2}}, Kind: 1, RangeEnd: 4},
+		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "d_session", TypeSize: 2}}, Kind: 1, RangeEnd: 4},
+		&StructType{Key: StructKey{Name: "sockaddr_in6"}, FldName: "addr"},
+	}}},
+	{Key: StructKey{Name: "pppol2tpin6_addr_t[int16]", Dir: 1}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "pppol2tpin6_addr_t[int16]", TypeSize: 44, ArgDir: 1}, Fields: []Type{
+		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "pid", TypeSize: 4, ArgDir: 1}}},
+		&ResourceType{TypeCommon: TypeCommon{TypeName: "sock", FldName: "fd", TypeSize: 4, ArgDir: 1}},
+		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "s_tunnel", TypeSize: 2, ArgDir: 1}}, Kind: 1, RangeEnd: 4},
+		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "s_session", TypeSize: 2, ArgDir: 1}}, Kind: 1, RangeEnd: 4},
+		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "d_tunnel", TypeSize: 2, ArgDir: 1}}, Kind: 1, RangeEnd: 4},
+		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "d_session", TypeSize: 2, ArgDir: 1}}, Kind: 1, RangeEnd: 4},
+		&StructType{Key: StructKey{Name: "sockaddr_in6", Dir: 1}, FldName: "addr"},
+	}}},
+	{Key: StructKey{Name: "pppol2tpin6_addr_t[int32]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "pppol2tpin6_addr_t[int32]", TypeSize: 52}, Fields: []Type{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "pid", TypeSize: 4}}},
 		&ResourceType{TypeCommon: TypeCommon{TypeName: "sock", FldName: "fd", TypeSize: 4}},
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "s_tunnel", TypeSize: 4}}, Kind: 1, RangeEnd: 4},
@@ -20976,7 +20976,7 @@ var structDescs_ppc64le = []*KeyedStruct{
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "d_session", TypeSize: 4}}, Kind: 1, RangeEnd: 4},
 		&StructType{Key: StructKey{Name: "sockaddr_in6"}, FldName: "addr"},
 	}}},
-	{Key: StructKey{Name: "pppol2tpv3in6_addr", Dir: 1}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "pppol2tpv3in6_addr", TypeSize: 52, ArgDir: 1}, Fields: []Type{
+	{Key: StructKey{Name: "pppol2tpin6_addr_t[int32]", Dir: 1}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "pppol2tpin6_addr_t[int32]", TypeSize: 52, ArgDir: 1}, Fields: []Type{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "pid", TypeSize: 4, ArgDir: 1}}},
 		&ResourceType{TypeCommon: TypeCommon{TypeName: "sock", FldName: "fd", TypeSize: 4, ArgDir: 1}},
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "s_tunnel", TypeSize: 4, ArgDir: 1}}, Kind: 1, RangeEnd: 4},
@@ -23723,42 +23723,42 @@ var structDescs_ppc64le = []*KeyedStruct{
 	{Key: StructKey{Name: "sockaddr_l2tp_t[pppol2tp_addr]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "sockaddr_l2tp_t[pppol2tp_addr]", TypeSize: 38}, Fields: []Type{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "sa_family", TypeSize: 2}}, Val: 24},
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "sa_protocol", TypeSize: 4}}, Val: 1},
-		&StructType{Key: StructKey{Name: "pppol2tp_addr"}, FldName: "addr"},
+		&StructType{Key: StructKey{Name: "pppol2tp_addr_t[int16]"}, FldName: "addr"},
 	}}},
 	{Key: StructKey{Name: "sockaddr_l2tp_t[pppol2tp_addr]", Dir: 1}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "sockaddr_l2tp_t[pppol2tp_addr]", TypeSize: 38, ArgDir: 1}, Fields: []Type{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "sa_family", TypeSize: 2, ArgDir: 1}}, Val: 24},
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "sa_protocol", TypeSize: 4, ArgDir: 1}}, Val: 1},
-		&StructType{Key: StructKey{Name: "pppol2tp_addr", Dir: 1}, FldName: "addr"},
+		&StructType{Key: StructKey{Name: "pppol2tp_addr_t[int16]", Dir: 1}, FldName: "addr"},
 	}}},
 	{Key: StructKey{Name: "sockaddr_l2tp_t[pppol2tpin6_addr]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "sockaddr_l2tp_t[pppol2tpin6_addr]", TypeSize: 50}, Fields: []Type{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "sa_family", TypeSize: 2}}, Val: 24},
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "sa_protocol", TypeSize: 4}}, Val: 1},
-		&StructType{Key: StructKey{Name: "pppol2tpin6_addr"}, FldName: "addr"},
+		&StructType{Key: StructKey{Name: "pppol2tpin6_addr_t[int16]"}, FldName: "addr"},
 	}}},
 	{Key: StructKey{Name: "sockaddr_l2tp_t[pppol2tpin6_addr]", Dir: 1}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "sockaddr_l2tp_t[pppol2tpin6_addr]", TypeSize: 50, ArgDir: 1}, Fields: []Type{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "sa_family", TypeSize: 2, ArgDir: 1}}, Val: 24},
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "sa_protocol", TypeSize: 4, ArgDir: 1}}, Val: 1},
-		&StructType{Key: StructKey{Name: "pppol2tpin6_addr", Dir: 1}, FldName: "addr"},
+		&StructType{Key: StructKey{Name: "pppol2tpin6_addr_t[int16]", Dir: 1}, FldName: "addr"},
 	}}},
 	{Key: StructKey{Name: "sockaddr_l2tp_t[pppol2tpv3_addr]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "sockaddr_l2tp_t[pppol2tpv3_addr]", TypeSize: 46}, Fields: []Type{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "sa_family", TypeSize: 2}}, Val: 24},
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "sa_protocol", TypeSize: 4}}, Val: 1},
-		&StructType{Key: StructKey{Name: "pppol2tpv3_addr"}, FldName: "addr"},
+		&StructType{Key: StructKey{Name: "pppol2tp_addr_t[int32]"}, FldName: "addr"},
 	}}},
 	{Key: StructKey{Name: "sockaddr_l2tp_t[pppol2tpv3_addr]", Dir: 1}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "sockaddr_l2tp_t[pppol2tpv3_addr]", TypeSize: 46, ArgDir: 1}, Fields: []Type{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "sa_family", TypeSize: 2, ArgDir: 1}}, Val: 24},
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "sa_protocol", TypeSize: 4, ArgDir: 1}}, Val: 1},
-		&StructType{Key: StructKey{Name: "pppol2tpv3_addr", Dir: 1}, FldName: "addr"},
+		&StructType{Key: StructKey{Name: "pppol2tp_addr_t[int32]", Dir: 1}, FldName: "addr"},
 	}}},
 	{Key: StructKey{Name: "sockaddr_l2tp_t[pppol2tpv3in6_addr]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "sockaddr_l2tp_t[pppol2tpv3in6_addr]", TypeSize: 58}, Fields: []Type{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "sa_family", TypeSize: 2}}, Val: 24},
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "sa_protocol", TypeSize: 4}}, Val: 1},
-		&StructType{Key: StructKey{Name: "pppol2tpv3in6_addr"}, FldName: "addr"},
+		&StructType{Key: StructKey{Name: "pppol2tpin6_addr_t[int32]"}, FldName: "addr"},
 	}}},
 	{Key: StructKey{Name: "sockaddr_l2tp_t[pppol2tpv3in6_addr]", Dir: 1}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "sockaddr_l2tp_t[pppol2tpv3in6_addr]", TypeSize: 58, ArgDir: 1}, Fields: []Type{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "sa_family", TypeSize: 2, ArgDir: 1}}, Val: 24},
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "sa_protocol", TypeSize: 4, ArgDir: 1}}, Val: 1},
-		&StructType{Key: StructKey{Name: "pppol2tpv3in6_addr", Dir: 1}, FldName: "addr"},
+		&StructType{Key: StructKey{Name: "pppol2tpin6_addr_t[int32]", Dir: 1}, FldName: "addr"},
 	}}},
 	{Key: StructKey{Name: "sockaddr_ll"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "sockaddr_ll", TypeSize: 20}, Fields: []Type{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "sll_family", TypeSize: 2}}, Val: 17},
@@ -55251,4 +55251,4 @@ var consts_ppc64le = []ConstValue{
 	{Name: "bpf_insn_load_imm_dw", Value: 24},
 }
 
-const revision_ppc64le = "c34246df0cacafad156f78b6a115946fcea4472e"
+const revision_ppc64le = "3ebba850033cbcba146d3f2f1f9153dfa74ac899"
diff --git a/sys/linux/netfilter.txt b/sys/linux/netfilter.txt
index 1687b6dba..046afd185 100644
--- a/sys/linux/netfilter.txt
+++ b/sys/linux/netfilter.txt
@@ -225,8 +225,8 @@ xt_rateest_match_flags = XT_RATEEST_MATCH_INVERT, XT_RATEEST_MATCH_ABS, XT_RATEE
 xt_rateest_match_mode = XT_RATEEST_MATCH_NONE, XT_RATEEST_MATCH_EQ, XT_RATEEST_MATCH_LT, XT_RATEEST_MATCH_GT
 
 xt_l2tp_info {
-	tid	l2tp_tunnel32
-	sid	l2tp_session32
+	tid	l2tp_tunnel[int32]
+	sid	l2tp_session[int32]
 	version	int8[2:3]
 	type	flags[xt_l2tp_type, int8]
 	flags	flags[xt_l2tp_flags, int8]
diff --git a/sys/linux/socket_pppox.txt b/sys/linux/socket_pppox.txt
index bf59bad7c..c8c698674 100644
--- a/sys/linux/socket_pppox.txt
+++ b/sys/linux/socket_pppox.txt
@@ -13,10 +13,8 @@ resource sock_pptp[sock_pppox]
 
 type pptp_call_id int16be[0:3]
 type sid_t int16[0:4]
-type l2tp_tunnel16 int16[0:4]
-type l2tp_session16 int16[0:4]
-type l2tp_tunnel32 int32[0:4]
-type l2tp_session32 int32[0:4]
+type l2tp_tunnel[BASE] BASE[0:4]
+type l2tp_session[BASE] BASE[0:4]
 
 socket$pppoe(domain const[AF_PPPOX], type const[SOCK_STREAM], proto const[PX_PROTO_OE]) sock_pppoe
 connect$pppoe(fd sock_pppoe, addr ptr[in, sockaddr_pppoe], addrlen len[addr])
@@ -76,45 +74,30 @@ type sockaddr_l2tp_t[ADDR] {
 	addr		ADDR
 } [packed]
 
-pppol2tp_addr {
+type pppol2tp_addr_t[BASE] {
 	pid		const[0, int32]
 	fd		sock
 	addr		sockaddr_in
-	s_tunnel	l2tp_tunnel16
-	s_session	l2tp_session16
-	d_tunnel	l2tp_tunnel16
-	d_session	l2tp_session16
+	s_tunnel	l2tp_tunnel[BASE]
+	s_session	l2tp_session[BASE]
+	d_tunnel	l2tp_tunnel[BASE]
+	d_session	l2tp_session[BASE]
 }
 
-pppol2tpin6_addr {
+type pppol2tpin6_addr_t[BASE] {
 	pid		const[0, int32]
 	fd		sock
-	s_tunnel	l2tp_tunnel16
-	s_session	l2tp_session16
-	d_tunnel	l2tp_tunnel16
-	d_session	l2tp_session16
+	s_tunnel	l2tp_tunnel[BASE]
+	s_session	l2tp_session[BASE]
+	d_tunnel	l2tp_tunnel[BASE]
+	d_session	l2tp_session[BASE]
 	addr		sockaddr_in6
 }
 
-pppol2tpv3_addr {
-	pid		const[0, int32]
-	fd		sock
-	addr		sockaddr_in
-	s_tunnel	l2tp_tunnel32
-	s_session	l2tp_session32
-	d_tunnel	l2tp_tunnel32
-	d_session	l2tp_session32
-}
-
-pppol2tpv3in6_addr {
-	pid		const[0, int32]
-	fd		sock
-	s_tunnel	l2tp_tunnel32
-	s_session	l2tp_session32
-	d_tunnel	l2tp_tunnel32
-	d_session	l2tp_session32
-	addr		sockaddr_in6
-}
+type pppol2tp_addr pppol2tp_addr_t[int16]
+type pppol2tpv3_addr pppol2tp_addr_t[int32]
+type pppol2tpin6_addr pppol2tpin6_addr_t[int16]
+type pppol2tpv3in6_addr pppol2tpin6_addr_t[int32]
 
 sockaddr_pptp {
 	sa_family	const[AF_PPPOX, int16]