Merge tag 'v3.18.112' into XOS-8.1

This is the 3.18.112 stable release # gpg: Signature made Wed 30 May 2018 10:08:06 PM CEST # gpg: using RSA key 38DBBDC86092693E # gpg: Can't check signature: No public key * tag 'v3.18.112': Linux 3.18.112 Revert "vti4: Don't override MTU passed on link creation via IFLA_MTU"
msfjarvis · May 31, 2018 · a4e962a · a4e962a
2 parents bb53b26 + b0b357c
commit a4e962a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 VERSION = 3
 PATCHLEVEL = 18
-SUBLEVEL = 111
+SUBLEVEL = 112
 EXTRAVERSION =
 NAME = Diseased Newt
 

diff --git a/net/ipv4/ip_vti.c b/net/ipv4/ip_vti.c
@@ -365,6 +365,7 @@ static int vti_tunnel_init(struct net_device *dev)
 	memcpy(dev->dev_addr, &iph->saddr, 4);
 	memcpy(dev->broadcast, &iph->daddr, 4);
 
+	dev->mtu		= ETH_DATA_LEN;
 	dev->flags		= IFF_NOARP;
 	dev->iflink		= 0;
 	dev->addr_len		= 4;