From 8fecec2eb071e9ae0a62e9e3d34ac41eb4cc8ab2 Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Sun, 22 Dec 2019 09:29:44 +0100 Subject: sys/linux: another batch of warning fixes The only remaining part now is dev_video4linux.txt Update #590 --- sys/linux/vnet.txt | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) (limited to 'sys/linux/vnet.txt') diff --git a/sys/linux/vnet.txt b/sys/linux/vnet.txt index b0038ff92..43bb9766b 100644 --- a/sys/linux/vnet.txt +++ b/sys/linux/vnet.txt @@ -913,8 +913,8 @@ gre_packet { # ipv4 -> gre -> ipv4 -> ... cisco_ipv4 gre_packet_cisco[ETH_P_IP, array[int8]] cisco_ipv6 gre_packet_cisco[ETH_P_IPV6, array[int8]] - erspan1 gre_packet_erspan[ETH_P_ERSPAN, erspan_md1] - erspan2 gre_packet_erspan[ETH_P_ERSPAN2, erspan_md2] + erspan1 gre_packet_erspan[ETH_P_ERSPAN, erspan_md1_msg] + erspan2 gre_packet_erspan[ETH_P_ERSPAN2, erspan_md2_msg] teb gre_packet_erspan[ETH_P_TEB, array[int8]] } [packed] @@ -976,14 +976,16 @@ type erspan_base_hdr[VER] { } [packed] erspan_md1 { - base erspan_base_hdr[1] - version const[1, int32] index int32be } [packed] +erspan_md1_msg { + base erspan_base_hdr[1] + version const[1, int32] + payload erspan_md1 +} + erspan_md2 { - base erspan_base_hdr[2] - version const[2, int32] timestamp int32be sgt int16be hwid_upper int8:2 @@ -995,6 +997,12 @@ erspan_md2 { hwid int8:1 } [packed] +erspan_md2_msg { + base erspan_base_hdr[2] + version const[2, int32] + payload erspan_md2 +} + ################################################################################ ###################################### ICMP #################################### ################################################################################ -- cgit mrf-deployment