diff options
| author | Mark Brown <broonie@kernel.org> | 2018-06-01 11:34:55 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-06-01 11:34:55 +0100 |
| commit | 86a04ba0955e3c806ed301cf178f1e130f1cb785 (patch) | |
| tree | 079f204a413564d418717f308c694de7202334a4 | |
| parent | 9e5b0b8650adec15dddcacf930b0e4aa4142680a (diff) | |
| parent | 3762b3e2aa6c885ecfbdaf6fb9b3f6f0eef950b5 (diff) | |
Merge tag 'v4.9.105' into linux-linaro-lsk-v4.9lsk-v4.9-18.05
This is the 4.9.105 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 = 9 -SUBLEVEL = 104 +SUBLEVEL = 105 EXTRAVERSION = NAME = Roaring Lionus diff --git a/net/ipv4/ip_vti.c b/net/ipv4/ip_vti.c index 1ac55b116d5a..cbff0d6ff1ac 100644 --- a/net/ipv4/ip_vti.c +++ b/net/ipv4/ip_vti.c @@ -396,6 +396,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; |