diff options
| author | Greg Kroah-Hartman <gregkh@google.com> | 2018-05-30 20:44:08 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@google.com> | 2018-05-30 20:44:08 +0200 |
| commit | cb3afe1f1187bba5801dafadd9974bfbe3b9ff7a (patch) | |
| tree | a522cda0c37ddb41c1837b9d7ffffd612e6fe404 /net | |
| parent | 6e37ae0e7ab659f2fc48adb55c608e4f12467376 (diff) | |
Revert "vti4: Don't override MTU passed on link creation via IFLA_MTU"
This reverts commit 33cebc976c3b77bdf8f3fb4478cf776131ebfe4f which is
03080e5ec727 ("vti4: Don't override MTU passed on link creation via
IFLA_MTU") upstream as it causes test failures.
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv4/ip_vti.c | 1 |
1 files changed, 1 insertions, 0 deletions
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; |