From: Steffen Klassert <steffen.klassert@secunet.com>
Date: Wed, 16 Apr 2014 07:01:03 +0000 (+0200)
Subject: vti4: Don't count header length twice.
X-Git-Tag: v4.14-rc1~7493^2~30^2~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a32452366b7250c42e96a18ffc3ad8db9e0ca3c2;p=platform%2Fkernel%2Flinux-rpi.git

vti4: Don't count header length twice.

We currently count the size of LL_MAX_HEADER and struct iphdr
twice for vti4 devices, this leads to a wrong device mtu.
The size of LL_MAX_HEADER and struct iphdr is already counted in
ip_tunnel_bind_dev(), so don't do it again in vti_tunnel_init().

Fixes: b9959fd3 ("vti: switch to new ip tunnel code")
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
---

diff --git a/net/ipv4/ip_vti.c b/net/ipv4/ip_vti.c
index 687ddef..cd62596 100644
--- a/net/ipv4/ip_vti.c
+++ b/net/ipv4/ip_vti.c
@@ -349,7 +349,6 @@ static int vti_tunnel_init(struct net_device *dev)
 	memcpy(dev->broadcast, &iph->daddr, 4);
 
 	dev->type		= ARPHRD_TUNNEL;
-	dev->hard_header_len	= LL_MAX_HEADER + sizeof(struct iphdr);
 	dev->mtu		= ETH_DATA_LEN;
 	dev->flags		= IFF_NOARP;
 	dev->iflink		= 0;