diff options
| author | Steffen Klassert <steffen.klassert@secunet.com> | 2014-04-16 09:01:03 +0200 |
|---|---|---|
| committer | Moyster <oysterized@gmail.com> | 2017-06-17 15:52:05 +0200 |
| commit | acbb5ac7fa35397c4476b0d172e53967f215aeab (patch) | |
| tree | 4e56369e82a6987a07ceceeee4d756d782c94d59 /net/ipv4 | |
| parent | b4b694f80d3fe70bb10da9b4f58e4cb2bfd6f91b (diff) | |
vti4: Don't count header length twice.
commit a32452366b7250c42e96a18ffc3ad8db9e0ca3c2 upstream.
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>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Signed-off-by: Willy Tarreau <w@1wt.eu>
Diffstat (limited to 'net/ipv4')
| -rw-r--r-- | net/ipv4/ip_vti.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/ipv4/ip_vti.c b/net/ipv4/ip_vti.c index 4ec342751..eadafac6f 100644 --- a/net/ipv4/ip_vti.c +++ b/net/ipv4/ip_vti.c @@ -582,7 +582,6 @@ static void vti_tunnel_setup(struct net_device *dev) dev->type = ARPHRD_TUNNEL; dev->destructor = vti_dev_free; - dev->hard_header_len = LL_MAX_HEADER + sizeof(struct iphdr); dev->mtu = ETH_DATA_LEN; dev->flags = IFF_NOARP; dev->iflink = 0; |