From fe6b2d55bcb379d01664ed28cea40634cb6b52e3 Mon Sep 17 00:00:00 2001
From: Tom Gundersen <teg@jklm.no>
Date: Tue, 25 Feb 2014 21:16:17 +0100
Subject: networkd: add basic support for MACVLANs

---
 man/systemd.netdev.xml  | 20 ++++++++++++++++++--
 man/systemd.network.xml |  7 +++++++
 2 files changed, 25 insertions(+), 2 deletions(-)

(limited to 'man')

diff --git a/man/systemd.netdev.xml b/man/systemd.netdev.xml
index 26cc6158c9..5d8b41a3bc 100644
--- a/man/systemd.netdev.xml
+++ b/man/systemd.netdev.xml
@@ -142,8 +142,9 @@
                                         <term><varname>Kind=</varname></term>
                                         <listitem>
                                                 <para>The netdev kind. Currently, <literal>bridge</literal>,
-                                                <literal>bond</literal> and <literal>vlan</literal>
-                                                are supported. This option is compulsory.</para>
+                                                <literal>bond</literal>, <literal>vlan</literal> and
+                                                <literal>macvlan</literal> are supported. This option
+                                                is compulsory.</para>
                                         </listitem>
                                 </varlistentry>
                         </variablelist>
@@ -161,6 +162,21 @@
                                 </varlistentry>
                         </variablelist>
 
+                        <para>The <literal>[MACVLAN]</literal> section only applies for netdevs of kind
+                        <literal>macvlan</literal>, and accepts the following key:</para>
+
+                        <variablelist class='network-directives'>
+                                <varlistentry>
+                                        <term><varname>Mode=</varname></term>
+                                        <listitem>
+                                                <para>The MACVLAN mode to use. The supported options are
+                                                <literal>private</literal>, <literal>vepa</literal>,
+                                                <literal>bridge</literal> and <literal>passthru</literal>.
+                                                </para>
+                                        </listitem>
+                                </varlistentry>
+                        </variablelist>
+
         </refsect1>
 
         <refsect1>
diff --git a/man/systemd.network.xml b/man/systemd.network.xml
index 1ba4f4a971..fcf48c6d46 100644
--- a/man/systemd.network.xml
+++ b/man/systemd.network.xml
@@ -235,6 +235,13 @@
                                                 may be specified more than once.</para>
                                         </listitem>
                                 </varlistentry>
+                                <varlistentry>
+                                        <term><varname>MACVLAN=</varname></term>
+                                        <listitem>
+                                                <para>The name of a MACVLAN to create on the link. This option
+                                                may be specified more than once.</para>
+                                        </listitem>
+                                </varlistentry>
                         </variablelist>
 
                         <para>An <literal>[Address]</literal> section accepts the following keys.
-- 
cgit v1.2.3-54-g00ecf