From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Wed, 8 Jul 2020 20:31:42 +0000 (+0200)
Subject: Merge pull request #16405 from sipraga/master
X-Git-Tag: v246-rc1~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=48c190822b1f0658fd715446a9efe4d91a32411a;p=thirdparty%2Fsystemd.git

Merge pull request #16405 from sipraga/master
---

48c190822b1f0658fd715446a9efe4d91a32411a
diff --cc man/systemd.netdev.xml
index 37659326e36,80d1d20d308..c8ebd45c7f8
--- a/man/systemd.netdev.xml
+++ b/man/systemd.netdev.xml
@@@ -504,6 -505,16 +505,16 @@@
            </para>
          </listitem>
        </varlistentry>
+       <varlistentry>
+         <term><varname>SourceMACAddress=</varname></term>
+         <listitem>
+           <para>A whitespace-separated list of remote hardware addresses allowed on the MACVLAN. This
 -          option only has an affect in source mode. Use full colon-, hyphen- or dot-delimited
++          option only has an effect in source mode. Use full colon-, hyphen- or dot-delimited
+           hexadecimal. This option may appear more than once, in which case the lists are merged. If
+           the empty string is assigned to this option, the list of hardware addresses defined prior
+           to this is reset. Defaults to unset.</para>
+         </listitem>
+       </varlistentry>
      </variablelist>
    </refsect1>