1 files changed, 6 insertions, 4 deletions

diff --git a/net/ipv6/ip6_vti.c b/net/ipv6/ip6_vti.c
index fa3ae1cb50d3..2ceef41cc097 100644
--- a/net/ipv6/ip6_vti.c
+++ b/net/ipv6/ip6_vti.c
@@ -627,6 +627,7 @@ static void vti6_link_config(struct ip6_tnl *t)
         struct net_device *dev = t->dev;
         struct __ip6_tnl_parm *p = &t->parms;
         struct net_device *tdev = NULL;
+        int mtu;
 
         memcpy(dev->dev_addr, &p->laddr, sizeof(struct in6_addr));
         memcpy(dev->broadcast, &p->raddr, sizeof(struct in6_addr));
@@ -656,8 +657,11 @@ static void vti6_link_config(struct ip6_tnl *t)
                 tdev = __dev_get_by_index(t->net, p->link);
 
         if (tdev)
-                dev->mtu = max_t(int, tdev->mtu - dev->hard_header_len,
-                                 IPV6_MIN_MTU);
+                mtu = tdev->mtu - sizeof(struct ipv6hdr);
+        else
+                mtu = ETH_DATA_LEN - LL_MAX_HEADER - sizeof(struct ipv6hdr);
+
+        dev->mtu = max_t(int, mtu, IPV6_MIN_MTU);
 }
 
 /**
@@ -866,8 +870,6 @@ static void vti6_dev_setup(struct net_device *dev)
         dev->priv_destructor = vti6_dev_free;
 
         dev->type = ARPHRD_TUNNEL6;
-        dev->hard_header_len = LL_MAX_HEADER + sizeof(struct ipv6hdr);
-        dev->mtu = ETH_DATA_LEN;
         dev->min_mtu = IPV6_MIN_MTU;
         dev->max_mtu = IP_MAX_MTU;
         dev->flags |= IFF_NOARP;