From: Greg Kroah-Hartman <gregkh@google.com>
Date: Wed, 30 May 2018 18:27:15 +0000 (+0200)
Subject: Revert "vti4: Don't override MTU passed on link creation via IFLA_MTU"
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=84057b58ca77f70af1f0ae1f3922f50c3c10c417;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

Revert "vti4: Don't override MTU passed on link creation via IFLA_MTU"

This reverts commit 5815901c29c2936d7acbed2683d5807b4ae53ede which is
03080e5ec727 ("vti4: Don't override MTU passed on link creation via
IFLA_MTU") upstream as it causes test failures.

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
---

diff --git a/net/ipv4/ip_vti.c b/net/ipv4/ip_vti.c
index 5c5699c08575..00d4371d4573 100644
--- a/net/ipv4/ip_vti.c
+++ b/net/ipv4/ip_vti.c
@@ -396,6 +396,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->addr_len		= 4;
 	dev->features		|= NETIF_F_LLTX;