Commit 6f24c4485ca76c7e8b1b573addd7effb2c7a9bf4 | zig

author	Jens Goldberg <jens.goldberg@gmail.com> 2024-08-20 10:10:14+02:00
committer	Jens Goldberg <jens.goldberg@gmail.com> 2024-08-20 10:10:14+02:00
log	6f24c4485ca76c7e8b1b573addd7effb2c7a9bf4
tree	a7717535f724e09be5f93c9f8e741414c0c29903
parent	1950e52c6cbc8321bdc986278bcb1cc510552b15

1 files changed, 24 insertions(+), 7 deletions(-)

lib/std/os/linux.zig+24-7

 @@ -6915,9 +6915,7 @@ pub const TP_STATUS = extern union {
     },
 };
-pub const tpacket_block_desc = extern struct {
+pub const tpacket_hdr_v1 = extern struct {
-    version: u32,
-    offset_to_priv: u32,
     block_status: TP_STATUS,
     num_pkts: u32,
     offset_to_first_pkt: u32,
 @@ -6927,6 +6925,27 @@ pub const tpacket_block_desc = extern struct {
     ts_last_pkt: tpacket_bd_ts,
 };
+pub const tpacket_bd_header_u = extern union {
+    bh1: tpacket_hdr_v1,
+};
+pub const tpacket_block_desc = extern struct {
+    version: u32,
+    offset_to_priv: u32,
+    hdr: tpacket_bd_header_u,
+};
+pub const tpacket_hdr_variant1 = extern struct {
+    rxhash: u32,
+    vlan_tci: u32,
+    vlan_tpid: u16,
+    padding: u16,
+};
+pub const tpacket3_hdr_variants = extern union {
+    hv1: tpacket_hdr_variant1,
+};
 pub const tpacket3_hdr = extern struct {
     next_offset: u32,
     sec: u32,
 @@ -6936,10 +6955,8 @@ pub const tpacket3_hdr = extern struct {
     status: u32,
     mac: u16,
     net: u16,
-    rxhash: u32,
+    variant: tpacket3_hdr_variants,
-    vlan_tci: u32,
+    padding: [8]u8,
-    vlan_tpid: u16,
-    padding: [10]u8,
 };
 pub const tpacket_stats_v3 = extern struct {