From: Tom Gundersen <teg@jklm.no>
Date: Thu, 3 Jul 2014 10:19:14 +0000 (+0200)
Subject: networkd: tuntap - default to no packet information
X-Git-Tag: v215~26
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=ffd488e272aa95f7d43626e1f90fea8c30a5863b;p=elogind.git

networkd: tuntap - default to no packet information

Susant says:
> ip tuntap turns this off by default.

Let's follow ip(8) here as that should be the least surprising.
---

diff --git a/man/systemd.netdev.xml b/man/systemd.netdev.xml
index 64987980a..c90bd8f98 100644
--- a/man/systemd.netdev.xml
+++ b/man/systemd.netdev.xml
@@ -366,7 +366,7 @@
                                         <listitem><para>Takes a boolean argument. Configures whether packets
                                         should be prepened with four extra bytes (two flag bytes and two
                                         protocol bytes). If disabled it indicates that the packets will be
-                                        pure IP packets. Defaults to <literal>yes</literal>.</para>
+                                        pure IP packets. Defaults to <literal>no</literal>.</para>
                                         </listitem>
                                 </varlistentry>
                                 <varlistentry>
diff --git a/src/network/networkd-netdev.c b/src/network/networkd-netdev.c
index 5ee9da6de..a8c1ea3b4 100644
--- a/src/network/networkd-netdev.c
+++ b/src/network/networkd-netdev.c
@@ -569,7 +569,6 @@ static int netdev_load_one(Manager *manager, const char *filename) {
         netdev->vxlanid = VXLAN_VID_MAX + 1;
         netdev->tunnel_pmtudisc = true;
         netdev->learning = true;
-        netdev->packet_info = true;
 
         r = config_parse(NULL, filename, file,
                          "Match\0NetDev\0VLAN\0MACVLAN\0VXLAN\0Tunnel\0Peer\0Tun\0Tap\0",