diff options
| author | Mark Brown <broonie@kernel.org> | 2018-06-01 11:36:03 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-06-01 11:36:03 +0100 |
| commit | 0c3fbf0e5ded6ac673e7be10fb4e550872a91f1b (patch) | |
| tree | 381d5ee15d5cb7de71531c6c7783de7fbf267b3f | |
| parent | d30fe0ff9c0c7edb2335da0ccb0a2fa2bb6d057e (diff) | |
| parent | a794bca783fd36c5d3da00fc99a54deac92d4702 (diff) | |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-rtlsk-v4.4-18.05-rt
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | net/ipv4/ip_vti.c | 1 |
2 files changed, 2 insertions, 1 deletions
@@ -1,6 +1,6 @@ VERSION = 4 PATCHLEVEL = 4 -SUBLEVEL = 134 +SUBLEVEL = 135 EXTRAVERSION = NAME = Blurry Fish Butt diff --git a/net/ipv4/ip_vti.c b/net/ipv4/ip_vti.c index fa79e8118b9b..4b7c81f88abf 100644 --- a/net/ipv4/ip_vti.c +++ b/net/ipv4/ip_vti.c @@ -366,6 +366,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; |