diff options
| author | Mark Brown <broonie@kernel.org> | 2018-06-01 11:35:13 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-06-01 11:35:13 +0100 |
| commit | a794bca783fd36c5d3da00fc99a54deac92d4702 (patch) | |
| tree | 5f2d2a1e1ecaf6b4aa2e1d72be9746e5fc07c974 | |
| parent | 031155013b5ac4b5a86f7c7d87ed4b379f62ff21 (diff) | |
| parent | 50eb02ed89920f753202d703541bebbd9d8c3dd8 (diff) | |
Merge tag 'v4.4.135' into linux-linaro-lsk-v4.4lsk-v4.4-18.05
This is the 4.4.135 stable release
| -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; |