[systemd-commits] man/systemd.netdev.xml src/network

[Tom Gundersen]

 man/systemd.netdev.xml        |    2 +-
 src/network/networkd-netdev.c |    1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

New commits:
commit ffd488e272aa95f7d43626e1f90fea8c30a5863b
Author: Tom Gundersen <teg at jklm.no>
Date:   Thu Jul 3 12:19:14 2014 +0200

    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 6498798..c90bd8f 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 5ee9da6..a8c1ea3 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",