summaryrefslogtreecommitdiffstats
path: root/net/ipv4
diff options
context:
space:
mode:
authorSteffen Klassert <steffen.klassert@secunet.com>2014-04-16 09:01:03 +0200
committerSteffen Klassert <steffen.klassert@secunet.com>2014-04-16 09:01:03 +0200
commita32452366b7250c42e96a18ffc3ad8db9e0ca3c2 (patch)
tree99f02a096e25534e967b3b0f8239422b098322db /net/ipv4
parent5596732fa8c14139018ecda8356eabbfb599d830 (diff)
downloadlinux-a32452366b7250c42e96a18ffc3ad8db9e0ca3c2.tar.gz
linux-a32452366b7250c42e96a18ffc3ad8db9e0ca3c2.tar.bz2
linux-a32452366b7250c42e96a18ffc3ad8db9e0ca3c2.zip
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>
Diffstat (limited to 'net/ipv4')
-rw-r--r--net/ipv4/ip_vti.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/net/ipv4/ip_vti.c b/net/ipv4/ip_vti.c
index 687ddef4e574..cd62596e9a87 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;