sys/linux/usb: fix CDC mac address encoding

6 files changed, 39 insertions, 27 deletions

diff --git a/sys/linux/gen/386.go b/sys/linux/gen/386.go
index 522bf4ff5..6810b12f3 100644
--- a/sys/linux/gen/386.go
+++ b/sys/linux/gen/386.go
@@ -25368,8 +25368,10 @@ var structDescs_386 = []*KeyedStruct{
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "bcdVersion", TypeSize: 2}}},
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "wMaxCommand", TypeSize: 2}}},
 	}}},
-	{Key: StructKey{Name: "usb_cdc_ecm_mac"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "usb_cdc_ecm_mac", TypeSize: 48}, Fields: []Type{
-		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "data", TypeSize: 48}, Kind: 2, Values: []string{"340032003400320034003200340032003400320034003200"}, NoZ: true},
+	{Key: StructKey{Name: "usb_cdc_ecm_mac"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "usb_cdc_ecm_mac", TypeSize: 24}, Fields: []Type{
+		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "data0", TypeSize: 8}, ArgFormat: 1}, Val: 3747049866426069504},
+		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "data1", TypeSize: 8}, ArgFormat: 1}, Val: 3747049866426069504},
+		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "data2", TypeSize: 8}, ArgFormat: 1}, Val: 3747049866426069504},
 	}}},
 	{Key: StructKey{Name: "usb_cdc_ecm_mbm_guid"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "usb_cdc_ecm_mbm_guid", TypeSize: 16}, Fields: []Type{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "id0", TypeSize: 8}}, Val: 94397490813999011},
@@ -26062,7 +26064,7 @@ var structDescs_386 = []*KeyedStruct{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bDescriptorType", TypeSize: 1}}, Val: 3},
 		&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "usb_lang_ids", FldName: "data", TypeSize: 2}}, Vals: []uint64{1078, 1052, 1025, 2049, 3073, 4097, 5121, 6145, 7169, 8193, 9217, 10241, 11265, 12289, 13313, 14337, 15361, 16385, 1067, 1101, 1068, 2092, 1069, 1059, 1093, 1026, 1109, 1027, 1028, 2052, 3076, 4100, 5124, 1050, 1029, 1030, 1043, 2067, 1033, 2057, 3081, 4105, 5129, 6153, 7177, 8201, 9225, 10249, 11273, 12297, 13321, 1061, 1080, 1065, 1035, 1036, 2060, 3084, 4108, 5132, 6156, 1079, 1031, 2055, 3079, 4103, 5127, 1032, 1095, 1037, 1081, 1038, 1039, 1057, 1040, 2064, 1041, 1099, 2144, 1087, 1111, 1042, 2066, 1062, 1063, 2087, 1071, 1086, 2110, 1100, 1112, 1102, 2145, 1044, 2068, 1096, 1045, 1046, 2070, 1094, 1048, 1049, 1103, 3098, 2074, 1113, 1051, 1060, 1034, 2058, 3082, 4106, 5130, 6154, 7178, 8202, 9226, 10250, 11274, 12298, 13322, 14346, 15370, 16394, 17418, 18442, 19466, 20490, 1072, 1089, 1053, 2077, 1097, 1092, 1098, 1054, 1055, 1058, 1056, 2080, 1091, 2115, 1066, 1279, 61695, 62719, 63743, 64767}},
 	}}},
-	{Key: StructKey{Name: "usb_string_descriptor_t[usb_cdc_ecm_mac]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "usb_string_descriptor_t[usb_cdc_ecm_mac]", TypeSize: 50}, Fields: []Type{
+	{Key: StructKey{Name: "usb_string_descriptor_t[usb_cdc_ecm_mac]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "usb_string_descriptor_t[usb_cdc_ecm_mac]", TypeSize: 26}, Fields: []Type{
 		&LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "bLength", TypeSize: 1}}, Path: []string{"parent"}},
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bDescriptorType", TypeSize: 1}}, Val: 3},
 		&StructType{Key: StructKey{Name: "usb_cdc_ecm_mac"}, FldName: "data"},
@@ -27204,7 +27206,7 @@ var structDescs_386 = []*KeyedStruct{
 		&LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bytesize", FldName: "len", TypeSize: 4}}, BitSize: 8, Path: []string{"data"}},
 		&UnionType{Key: StructKey{Name: "usb_string_descriptor"}, FldName: "data"},
 	}}},
-	{Key: StructKey{Name: "vusb_descriptor_t[USB_TYPE_STANDARD, USB_DT_STRING, usb_string_descriptor_t[usb_cdc_ecm_mac]]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "vusb_descriptor_t[USB_TYPE_STANDARD, USB_DT_STRING, usb_string_descriptor_t[usb_cdc_ecm_mac]]", TypeSize: 56}, Fields: []Type{
+	{Key: StructKey{Name: "vusb_descriptor_t[USB_TYPE_STANDARD, USB_DT_STRING, usb_string_descriptor_t[usb_cdc_ecm_mac]]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "vusb_descriptor_t[USB_TYPE_STANDARD, USB_DT_STRING, usb_string_descriptor_t[usb_cdc_ecm_mac]]", TypeSize: 32}, Fields: []Type{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "type", TypeSize: 1}}},
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "req", TypeSize: 1}}, Val: 3},
 		&LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bytesize", FldName: "len", TypeSize: 4}}, BitSize: 8, Path: []string{"data"}},
@@ -52555,4 +52557,4 @@ var consts_386 = []ConstValue{
 	{Name: "bpf_insn_load_imm_dw", Value: 24},
 }
 
-const revision_386 = "636ae31070329c5ab8d1392b18ccef13dd4b88eb"
+const revision_386 = "6c600dc9e424904f3bf19b9e8ade5a7d397827a9"
diff --git a/sys/linux/gen/amd64.go b/sys/linux/gen/amd64.go
index 8fb651403..00ec52fee 100644
--- a/sys/linux/gen/amd64.go
+++ b/sys/linux/gen/amd64.go
@@ -25739,8 +25739,10 @@ var structDescs_amd64 = []*KeyedStruct{
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "bcdVersion", TypeSize: 2}}},
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "wMaxCommand", TypeSize: 2}}},
 	}}},
-	{Key: StructKey{Name: "usb_cdc_ecm_mac"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "usb_cdc_ecm_mac", TypeSize: 48}, Fields: []Type{
-		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "data", TypeSize: 48}, Kind: 2, Values: []string{"340032003400320034003200340032003400320034003200"}, NoZ: true},
+	{Key: StructKey{Name: "usb_cdc_ecm_mac"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "usb_cdc_ecm_mac", TypeSize: 24}, Fields: []Type{
+		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "data0", TypeSize: 8}, ArgFormat: 1}, Val: 3747049866426069504},
+		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "data1", TypeSize: 8}, ArgFormat: 1}, Val: 3747049866426069504},
+		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "data2", TypeSize: 8}, ArgFormat: 1}, Val: 3747049866426069504},
 	}}},
 	{Key: StructKey{Name: "usb_cdc_ecm_mbm_guid"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "usb_cdc_ecm_mbm_guid", TypeSize: 16}, Fields: []Type{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "id0", TypeSize: 8}}, Val: 94397490813999011},
@@ -26433,7 +26435,7 @@ var structDescs_amd64 = []*KeyedStruct{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bDescriptorType", TypeSize: 1}}, Val: 3},
 		&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "usb_lang_ids", FldName: "data", TypeSize: 2}}, Vals: []uint64{1078, 1052, 1025, 2049, 3073, 4097, 5121, 6145, 7169, 8193, 9217, 10241, 11265, 12289, 13313, 14337, 15361, 16385, 1067, 1101, 1068, 2092, 1069, 1059, 1093, 1026, 1109, 1027, 1028, 2052, 3076, 4100, 5124, 1050, 1029, 1030, 1043, 2067, 1033, 2057, 3081, 4105, 5129, 6153, 7177, 8201, 9225, 10249, 11273, 12297, 13321, 1061, 1080, 1065, 1035, 1036, 2060, 3084, 4108, 5132, 6156, 1079, 1031, 2055, 3079, 4103, 5127, 1032, 1095, 1037, 1081, 1038, 1039, 1057, 1040, 2064, 1041, 1099, 2144, 1087, 1111, 1042, 2066, 1062, 1063, 2087, 1071, 1086, 2110, 1100, 1112, 1102, 2145, 1044, 2068, 1096, 1045, 1046, 2070, 1094, 1048, 1049, 1103, 3098, 2074, 1113, 1051, 1060, 1034, 2058, 3082, 4106, 5130, 6154, 7178, 8202, 9226, 10250, 11274, 12298, 13322, 14346, 15370, 16394, 17418, 18442, 19466, 20490, 1072, 1089, 1053, 2077, 1097, 1092, 1098, 1054, 1055, 1058, 1056, 2080, 1091, 2115, 1066, 1279, 61695, 62719, 63743, 64767}},
 	}}},
-	{Key: StructKey{Name: "usb_string_descriptor_t[usb_cdc_ecm_mac]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "usb_string_descriptor_t[usb_cdc_ecm_mac]", TypeSize: 50}, Fields: []Type{
+	{Key: StructKey{Name: "usb_string_descriptor_t[usb_cdc_ecm_mac]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "usb_string_descriptor_t[usb_cdc_ecm_mac]", TypeSize: 26}, Fields: []Type{
 		&LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "bLength", TypeSize: 1}}, Path: []string{"parent"}},
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bDescriptorType", TypeSize: 1}}, Val: 3},
 		&StructType{Key: StructKey{Name: "usb_cdc_ecm_mac"}, FldName: "data"},
@@ -27582,7 +27584,7 @@ var structDescs_amd64 = []*KeyedStruct{
 		&LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bytesize", FldName: "len", TypeSize: 4}}, BitSize: 8, Path: []string{"data"}},
 		&UnionType{Key: StructKey{Name: "usb_string_descriptor"}, FldName: "data"},
 	}}},
-	{Key: StructKey{Name: "vusb_descriptor_t[USB_TYPE_STANDARD, USB_DT_STRING, usb_string_descriptor_t[usb_cdc_ecm_mac]]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "vusb_descriptor_t[USB_TYPE_STANDARD, USB_DT_STRING, usb_string_descriptor_t[usb_cdc_ecm_mac]]", TypeSize: 56}, Fields: []Type{
+	{Key: StructKey{Name: "vusb_descriptor_t[USB_TYPE_STANDARD, USB_DT_STRING, usb_string_descriptor_t[usb_cdc_ecm_mac]]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "vusb_descriptor_t[USB_TYPE_STANDARD, USB_DT_STRING, usb_string_descriptor_t[usb_cdc_ecm_mac]]", TypeSize: 32}, Fields: []Type{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "type", TypeSize: 1}}},
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "req", TypeSize: 1}}, Val: 3},
 		&LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bytesize", FldName: "len", TypeSize: 4}}, BitSize: 8, Path: []string{"data"}},
@@ -53092,4 +53094,4 @@ var consts_amd64 = []ConstValue{
 	{Name: "bpf_insn_load_imm_dw", Value: 24},
 }
 
-const revision_amd64 = "de3005dc3194bbdb6258cdf1112d4029b2096f48"
+const revision_amd64 = "e8d337b13b9ae8f911b772c9be47236bc8446da4"
diff --git a/sys/linux/gen/arm.go b/sys/linux/gen/arm.go
index 7cdb2afb0..fbbafa8ce 100644
--- a/sys/linux/gen/arm.go
+++ b/sys/linux/gen/arm.go
@@ -25190,8 +25190,10 @@ var structDescs_arm = []*KeyedStruct{
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "bcdVersion", TypeSize: 2}}},
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "wMaxCommand", TypeSize: 2}}},
 	}}},
-	{Key: StructKey{Name: "usb_cdc_ecm_mac"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "usb_cdc_ecm_mac", TypeSize: 48}, Fields: []Type{
-		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "data", TypeSize: 48}, Kind: 2, Values: []string{"340032003400320034003200340032003400320034003200"}, NoZ: true},
+	{Key: StructKey{Name: "usb_cdc_ecm_mac"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "usb_cdc_ecm_mac", TypeSize: 24}, Fields: []Type{
+		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "data0", TypeSize: 8}, ArgFormat: 1}, Val: 3747049866426069504},
+		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "data1", TypeSize: 8}, ArgFormat: 1}, Val: 3747049866426069504},
+		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "data2", TypeSize: 8}, ArgFormat: 1}, Val: 3747049866426069504},
 	}}},
 	{Key: StructKey{Name: "usb_cdc_ecm_mbm_guid"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "usb_cdc_ecm_mbm_guid", TypeSize: 16}, Fields: []Type{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "id0", TypeSize: 8}}, Val: 94397490813999011},
@@ -25884,7 +25886,7 @@ var structDescs_arm = []*KeyedStruct{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bDescriptorType", TypeSize: 1}}, Val: 3},
 		&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "usb_lang_ids", FldName: "data", TypeSize: 2}}, Vals: []uint64{1078, 1052, 1025, 2049, 3073, 4097, 5121, 6145, 7169, 8193, 9217, 10241, 11265, 12289, 13313, 14337, 15361, 16385, 1067, 1101, 1068, 2092, 1069, 1059, 1093, 1026, 1109, 1027, 1028, 2052, 3076, 4100, 5124, 1050, 1029, 1030, 1043, 2067, 1033, 2057, 3081, 4105, 5129, 6153, 7177, 8201, 9225, 10249, 11273, 12297, 13321, 1061, 1080, 1065, 1035, 1036, 2060, 3084, 4108, 5132, 6156, 1079, 1031, 2055, 3079, 4103, 5127, 1032, 1095, 1037, 1081, 1038, 1039, 1057, 1040, 2064, 1041, 1099, 2144, 1087, 1111, 1042, 2066, 1062, 1063, 2087, 1071, 1086, 2110, 1100, 1112, 1102, 2145, 1044, 2068, 1096, 1045, 1046, 2070, 1094, 1048, 1049, 1103, 3098, 2074, 1113, 1051, 1060, 1034, 2058, 3082, 4106, 5130, 6154, 7178, 8202, 9226, 10250, 11274, 12298, 13322, 14346, 15370, 16394, 17418, 18442, 19466, 20490, 1072, 1089, 1053, 2077, 1097, 1092, 1098, 1054, 1055, 1058, 1056, 2080, 1091, 2115, 1066, 1279, 61695, 62719, 63743, 64767}},
 	}}},
-	{Key: StructKey{Name: "usb_string_descriptor_t[usb_cdc_ecm_mac]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "usb_string_descriptor_t[usb_cdc_ecm_mac]", TypeSize: 50}, Fields: []Type{
+	{Key: StructKey{Name: "usb_string_descriptor_t[usb_cdc_ecm_mac]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "usb_string_descriptor_t[usb_cdc_ecm_mac]", TypeSize: 26}, Fields: []Type{
 		&LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "bLength", TypeSize: 1}}, Path: []string{"parent"}},
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bDescriptorType", TypeSize: 1}}, Val: 3},
 		&StructType{Key: StructKey{Name: "usb_cdc_ecm_mac"}, FldName: "data"},
@@ -27010,7 +27012,7 @@ var structDescs_arm = []*KeyedStruct{
 		&LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bytesize", FldName: "len", TypeSize: 4}}, BitSize: 8, Path: []string{"data"}},
 		&UnionType{Key: StructKey{Name: "usb_string_descriptor"}, FldName: "data"},
 	}}},
-	{Key: StructKey{Name: "vusb_descriptor_t[USB_TYPE_STANDARD, USB_DT_STRING, usb_string_descriptor_t[usb_cdc_ecm_mac]]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "vusb_descriptor_t[USB_TYPE_STANDARD, USB_DT_STRING, usb_string_descriptor_t[usb_cdc_ecm_mac]]", TypeSize: 56}, Fields: []Type{
+	{Key: StructKey{Name: "vusb_descriptor_t[USB_TYPE_STANDARD, USB_DT_STRING, usb_string_descriptor_t[usb_cdc_ecm_mac]]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "vusb_descriptor_t[USB_TYPE_STANDARD, USB_DT_STRING, usb_string_descriptor_t[usb_cdc_ecm_mac]]", TypeSize: 32}, Fields: []Type{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "type", TypeSize: 1}}},
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "req", TypeSize: 1}}, Val: 3},
 		&LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bytesize", FldName: "len", TypeSize: 4}}, BitSize: 8, Path: []string{"data"}},
@@ -52132,4 +52134,4 @@ var consts_arm = []ConstValue{
 	{Name: "bpf_insn_load_imm_dw", Value: 24},
 }
 
-const revision_arm = "0748f4ef56bf1684b598e5a7661cd2c8dd134d59"
+const revision_arm = "c0010b3d05cb5d0ca1af17dacf9349c9cdf38c9e"
diff --git a/sys/linux/gen/arm64.go b/sys/linux/gen/arm64.go
index 5fe9bcf51..f36e0ef16 100644
--- a/sys/linux/gen/arm64.go
+++ b/sys/linux/gen/arm64.go
@@ -25556,8 +25556,10 @@ var structDescs_arm64 = []*KeyedStruct{
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "bcdVersion", TypeSize: 2}}},
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "wMaxCommand", TypeSize: 2}}},
 	}}},
-	{Key: StructKey{Name: "usb_cdc_ecm_mac"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "usb_cdc_ecm_mac", TypeSize: 48}, Fields: []Type{
-		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "data", TypeSize: 48}, Kind: 2, Values: []string{"340032003400320034003200340032003400320034003200"}, NoZ: true},
+	{Key: StructKey{Name: "usb_cdc_ecm_mac"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "usb_cdc_ecm_mac", TypeSize: 24}, Fields: []Type{
+		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "data0", TypeSize: 8}, ArgFormat: 1}, Val: 3747049866426069504},
+		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "data1", TypeSize: 8}, ArgFormat: 1}, Val: 3747049866426069504},
+		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "data2", TypeSize: 8}, ArgFormat: 1}, Val: 3747049866426069504},
 	}}},
 	{Key: StructKey{Name: "usb_cdc_ecm_mbm_guid"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "usb_cdc_ecm_mbm_guid", TypeSize: 16}, Fields: []Type{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "id0", TypeSize: 8}}, Val: 94397490813999011},
@@ -26250,7 +26252,7 @@ var structDescs_arm64 = []*KeyedStruct{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bDescriptorType", TypeSize: 1}}, Val: 3},
 		&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "usb_lang_ids", FldName: "data", TypeSize: 2}}, Vals: []uint64{1078, 1052, 1025, 2049, 3073, 4097, 5121, 6145, 7169, 8193, 9217, 10241, 11265, 12289, 13313, 14337, 15361, 16385, 1067, 1101, 1068, 2092, 1069, 1059, 1093, 1026, 1109, 1027, 1028, 2052, 3076, 4100, 5124, 1050, 1029, 1030, 1043, 2067, 1033, 2057, 3081, 4105, 5129, 6153, 7177, 8201, 9225, 10249, 11273, 12297, 13321, 1061, 1080, 1065, 1035, 1036, 2060, 3084, 4108, 5132, 6156, 1079, 1031, 2055, 3079, 4103, 5127, 1032, 1095, 1037, 1081, 1038, 1039, 1057, 1040, 2064, 1041, 1099, 2144, 1087, 1111, 1042, 2066, 1062, 1063, 2087, 1071, 1086, 2110, 1100, 1112, 1102, 2145, 1044, 2068, 1096, 1045, 1046, 2070, 1094, 1048, 1049, 1103, 3098, 2074, 1113, 1051, 1060, 1034, 2058, 3082, 4106, 5130, 6154, 7178, 8202, 9226, 10250, 11274, 12298, 13322, 14346, 15370, 16394, 17418, 18442, 19466, 20490, 1072, 1089, 1053, 2077, 1097, 1092, 1098, 1054, 1055, 1058, 1056, 2080, 1091, 2115, 1066, 1279, 61695, 62719, 63743, 64767}},
 	}}},
-	{Key: StructKey{Name: "usb_string_descriptor_t[usb_cdc_ecm_mac]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "usb_string_descriptor_t[usb_cdc_ecm_mac]", TypeSize: 50}, Fields: []Type{
+	{Key: StructKey{Name: "usb_string_descriptor_t[usb_cdc_ecm_mac]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "usb_string_descriptor_t[usb_cdc_ecm_mac]", TypeSize: 26}, Fields: []Type{
 		&LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "bLength", TypeSize: 1}}, Path: []string{"parent"}},
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bDescriptorType", TypeSize: 1}}, Val: 3},
 		&StructType{Key: StructKey{Name: "usb_cdc_ecm_mac"}, FldName: "data"},
@@ -27374,7 +27376,7 @@ var structDescs_arm64 = []*KeyedStruct{
 		&LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bytesize", FldName: "len", TypeSize: 4}}, BitSize: 8, Path: []string{"data"}},
 		&UnionType{Key: StructKey{Name: "usb_string_descriptor"}, FldName: "data"},
 	}}},
-	{Key: StructKey{Name: "vusb_descriptor_t[USB_TYPE_STANDARD, USB_DT_STRING, usb_string_descriptor_t[usb_cdc_ecm_mac]]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "vusb_descriptor_t[USB_TYPE_STANDARD, USB_DT_STRING, usb_string_descriptor_t[usb_cdc_ecm_mac]]", TypeSize: 56}, Fields: []Type{
+	{Key: StructKey{Name: "vusb_descriptor_t[USB_TYPE_STANDARD, USB_DT_STRING, usb_string_descriptor_t[usb_cdc_ecm_mac]]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "vusb_descriptor_t[USB_TYPE_STANDARD, USB_DT_STRING, usb_string_descriptor_t[usb_cdc_ecm_mac]]", TypeSize: 32}, Fields: []Type{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "type", TypeSize: 1}}},
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "req", TypeSize: 1}}, Val: 3},
 		&LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bytesize", FldName: "len", TypeSize: 4}}, BitSize: 8, Path: []string{"data"}},
@@ -52444,4 +52446,4 @@ var consts_arm64 = []ConstValue{
 	{Name: "bpf_insn_load_imm_dw", Value: 24},
 }
 
-const revision_arm64 = "ede8064d8a303e63ca27ee8160cfb30d174e642e"
+const revision_arm64 = "ace614dc3bdc1ab3e0dfe5514e2718cdd818e071"
diff --git a/sys/linux/gen/ppc64le.go b/sys/linux/gen/ppc64le.go
index 54334e744..e2280d03c 100644
--- a/sys/linux/gen/ppc64le.go
+++ b/sys/linux/gen/ppc64le.go
@@ -25426,8 +25426,10 @@ var structDescs_ppc64le = []*KeyedStruct{
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "bcdVersion", TypeSize: 2}}},
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "wMaxCommand", TypeSize: 2}}},
 	}}},
-	{Key: StructKey{Name: "usb_cdc_ecm_mac"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "usb_cdc_ecm_mac", TypeSize: 48}, Fields: []Type{
-		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "data", TypeSize: 48}, Kind: 2, Values: []string{"340032003400320034003200340032003400320034003200"}, NoZ: true},
+	{Key: StructKey{Name: "usb_cdc_ecm_mac"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "usb_cdc_ecm_mac", TypeSize: 24}, Fields: []Type{
+		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "data0", TypeSize: 8}, ArgFormat: 1}, Val: 3747049866426069504},
+		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "data1", TypeSize: 8}, ArgFormat: 1}, Val: 3747049866426069504},
+		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "data2", TypeSize: 8}, ArgFormat: 1}, Val: 3747049866426069504},
 	}}},
 	{Key: StructKey{Name: "usb_cdc_ecm_mbm_guid"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "usb_cdc_ecm_mbm_guid", TypeSize: 16}, Fields: []Type{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "id0", TypeSize: 8}}, Val: 94397490813999011},
@@ -26120,7 +26122,7 @@ var structDescs_ppc64le = []*KeyedStruct{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bDescriptorType", TypeSize: 1}}, Val: 3},
 		&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "usb_lang_ids", FldName: "data", TypeSize: 2}}, Vals: []uint64{1078, 1052, 1025, 2049, 3073, 4097, 5121, 6145, 7169, 8193, 9217, 10241, 11265, 12289, 13313, 14337, 15361, 16385, 1067, 1101, 1068, 2092, 1069, 1059, 1093, 1026, 1109, 1027, 1028, 2052, 3076, 4100, 5124, 1050, 1029, 1030, 1043, 2067, 1033, 2057, 3081, 4105, 5129, 6153, 7177, 8201, 9225, 10249, 11273, 12297, 13321, 1061, 1080, 1065, 1035, 1036, 2060, 3084, 4108, 5132, 6156, 1079, 1031, 2055, 3079, 4103, 5127, 1032, 1095, 1037, 1081, 1038, 1039, 1057, 1040, 2064, 1041, 1099, 2144, 1087, 1111, 1042, 2066, 1062, 1063, 2087, 1071, 1086, 2110, 1100, 1112, 1102, 2145, 1044, 2068, 1096, 1045, 1046, 2070, 1094, 1048, 1049, 1103, 3098, 2074, 1113, 1051, 1060, 1034, 2058, 3082, 4106, 5130, 6154, 7178, 8202, 9226, 10250, 11274, 12298, 13322, 14346, 15370, 16394, 17418, 18442, 19466, 20490, 1072, 1089, 1053, 2077, 1097, 1092, 1098, 1054, 1055, 1058, 1056, 2080, 1091, 2115, 1066, 1279, 61695, 62719, 63743, 64767}},
 	}}},
-	{Key: StructKey{Name: "usb_string_descriptor_t[usb_cdc_ecm_mac]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "usb_string_descriptor_t[usb_cdc_ecm_mac]", TypeSize: 50}, Fields: []Type{
+	{Key: StructKey{Name: "usb_string_descriptor_t[usb_cdc_ecm_mac]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "usb_string_descriptor_t[usb_cdc_ecm_mac]", TypeSize: 26}, Fields: []Type{
 		&LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "bLength", TypeSize: 1}}, Path: []string{"parent"}},
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bDescriptorType", TypeSize: 1}}, Val: 3},
 		&StructType{Key: StructKey{Name: "usb_cdc_ecm_mac"}, FldName: "data"},
@@ -27269,7 +27271,7 @@ var structDescs_ppc64le = []*KeyedStruct{
 		&LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bytesize", FldName: "len", TypeSize: 4}}, BitSize: 8, Path: []string{"data"}},
 		&UnionType{Key: StructKey{Name: "usb_string_descriptor"}, FldName: "data"},
 	}}},
-	{Key: StructKey{Name: "vusb_descriptor_t[USB_TYPE_STANDARD, USB_DT_STRING, usb_string_descriptor_t[usb_cdc_ecm_mac]]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "vusb_descriptor_t[USB_TYPE_STANDARD, USB_DT_STRING, usb_string_descriptor_t[usb_cdc_ecm_mac]]", TypeSize: 56}, Fields: []Type{
+	{Key: StructKey{Name: "vusb_descriptor_t[USB_TYPE_STANDARD, USB_DT_STRING, usb_string_descriptor_t[usb_cdc_ecm_mac]]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "vusb_descriptor_t[USB_TYPE_STANDARD, USB_DT_STRING, usb_string_descriptor_t[usb_cdc_ecm_mac]]", TypeSize: 32}, Fields: []Type{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "type", TypeSize: 1}}},
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "req", TypeSize: 1}}, Val: 3},
 		&LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bytesize", FldName: "len", TypeSize: 4}}, BitSize: 8, Path: []string{"data"}},
@@ -52409,4 +52411,4 @@ var consts_ppc64le = []ConstValue{
 	{Name: "bpf_insn_load_imm_dw", Value: 24},
 }
 
-const revision_ppc64le = "f41c5049e12ec7e7425fe1648710a00b2dabe77c"
+const revision_ppc64le = "a3c972567317d3e84a2e833c05a73c8218815ee9"
diff --git a/sys/linux/vusb.txt b/sys/linux/vusb.txt
index 26cb65125..5a306fc80 100644
--- a/sys/linux/vusb.txt
+++ b/sys/linux/vusb.txt
@@ -932,8 +932,10 @@ vusb_descriptors_cdc_ecm {
 } [packed]
 
 usb_cdc_ecm_mac {
-# This is a UTF16 encoded string '424242424242'.
-	data	stringnoz["340032003400320034003200340032003400320034003200"]
+# This is a UTF16 encoded string "424242424242".
+	data0	const[0x3400320034003200, int64be]
+	data1	const[0x3400320034003200, int64be]
+	data2	const[0x3400320034003200, int64be]
 } [packed]
 
 vusb_responses_cdc_ecm {