Annotation of /trunk/kernel-alx/patches-4.14/0146-4.14.47-all-fixes.patch
Parent Directory | Revision Log
Revision 3238 -
(hide annotations)
(download)
Fri Nov 9 12:14:58 2018 UTC (5 years, 10 months ago) by niro
File size: 661 byte(s)
Fri Nov 9 12:14:58 2018 UTC (5 years, 10 months ago) by niro
File size: 661 byte(s)
-added up to patches-4.14.79
1 | niro | 3238 | diff --git a/Makefile b/Makefile |
2 | index 3b1845f2b8f8..d6db01a02252 100644 | ||
3 | --- a/Makefile | ||
4 | +++ b/Makefile | ||
5 | @@ -1,7 +1,7 @@ | ||
6 | # SPDX-License-Identifier: GPL-2.0 | ||
7 | VERSION = 4 | ||
8 | PATCHLEVEL = 14 | ||
9 | -SUBLEVEL = 46 | ||
10 | +SUBLEVEL = 47 | ||
11 | EXTRAVERSION = | ||
12 | NAME = Petit Gorille | ||
13 | |||
14 | diff --git a/net/ipv4/ip_vti.c b/net/ipv4/ip_vti.c | ||
15 | index 5c5699c08575..00d4371d4573 100644 | ||
16 | --- a/net/ipv4/ip_vti.c | ||
17 | +++ b/net/ipv4/ip_vti.c | ||
18 | @@ -396,6 +396,7 @@ static int vti_tunnel_init(struct net_device *dev) | ||
19 | memcpy(dev->dev_addr, &iph->saddr, 4); | ||
20 | memcpy(dev->broadcast, &iph->daddr, 4); | ||
21 | |||
22 | + dev->mtu = ETH_DATA_LEN; | ||
23 | dev->flags = IFF_NOARP; | ||
24 | dev->addr_len = 4; | ||
25 | dev->features |= NETIF_F_LLTX; |