diff --git a/Makefile b/Makefile index 780dcc8033b2..7d06dba3fde8 100644 --- a/Makefile +++ b/Makefile @@ -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;