summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Gundersen <teg@jklm.no>2014-07-03 12:19:14 +0200
committerTom Gundersen <teg@jklm.no>2014-07-03 12:19:26 +0200
commitffd488e272aa95f7d43626e1f90fea8c30a5863b (patch)
tree4f79f32cf1201c87913de6785ddbdf808aa0340d
parent853284abddb0c944c0dd5844735022be03dc1ab0 (diff)
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.
-rw-r--r--man/systemd.netdev.xml2
-rw-r--r--src/network/networkd-netdev.c1
2 files changed, 1 insertions, 2 deletions
diff --git a/man/systemd.netdev.xml b/man/systemd.netdev.xml
index 64987980a7..c90bd8f98c 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 5ee9da6de0..a8c1ea3b44 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",