diff options
| author | Mark Brown <broonie@kernel.org> | 2018-06-01 11:40:19 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-06-01 11:40:19 +0100 |
| commit | 91983dd5325297de4a2b6e1e3f22497604b6c687 (patch) | |
| tree | 82a440219533c59dde336b383f89bcfe43da3aa5 /net/ipv4/ip_vti.c | |
| parent | c36e3982af7020ff66886b6a7d673a8a471c4eac (diff) | |
| parent | 9c465aceb29ae6033c9021cc38a7dd219d9edb43 (diff) | |
Merge branch 'linux-linaro-lsk-v4.14' into linux-linaro-lsk-v4.14-rtlsk-v4.14-18.05-rt
Diffstat (limited to 'net/ipv4/ip_vti.c')
| -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 c9cd891f69c2..00d4371d4573 100644 --- a/net/ipv4/ip_vti.c +++ b/net/ipv4/ip_vti.c @@ -396,7 +396,6 @@ static int vti_tunnel_init(struct net_device *dev) memcpy(dev->dev_addr, &iph->saddr, 4); memcpy(dev->broadcast, &iph->daddr, 4); - dev->hard_header_len = LL_MAX_HEADER + sizeof(struct iphdr); dev->mtu = ETH_DATA_LEN; dev->flags = IFF_NOARP; dev->addr_len = 4; |