From be1a56115bbc3dac09ccb92162a8d5f8937ba492 Mon Sep 17 00:00:00 2001
From: Dmitry Vyukov <dvyukov@google.com>
Date: Thu, 17 May 2018 12:16:18 +0200
Subject: sys/linux: use optional in tun descriptions

---
 sys/linux/tun.txt | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

(limited to 'sys/linux/tun.txt')

diff --git a/sys/linux/tun.txt b/sys/linux/tun.txt
index ca0047e39..09d998b9a 100755
--- a/sys/linux/tun.txt
+++ b/sys/linux/tun.txt
@@ -40,21 +40,11 @@ ioctl$TUNSETVNETBE(fd fd_tun, cmd const[TUNSETVNETBE], arg ptr[in, bool32])
 # virtio_net_hdr can be present or missing (depending on IFF_VNET_HDR).
 # We may want to support optional fields, which will make this simpler.
 tun_buffer {
-	pi	tun_pi_or_void
-	hdr	virtio_net_hdr_or_void
+	pi	optional[tun_pi]
+	hdr	optional[virtio_net_hdr]
 	data	tun_payload
 } [packed]
 
-tun_pi_or_void [
-	pi	tun_pi
-	void	void
-] [varlen]
-
-virtio_net_hdr_or_void [
-	hdr	virtio_net_hdr
-	void	void
-] [varlen]
-
 tun_pi {
 	flags	const[0, int16]
 	proto	flags[ether_types, int16be]
-- 
cgit mrf-deployment