Merge tag 'kvm-x86-pmu-6.6-fixes' of https://github.com/kvm-x86/linux into HEAD

[platform/kernel/linux-starfive.git] / net / ipv6 / sit.c

diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c
index 063560e..cc24cef 100644 (file)
--- a/net/ipv6/sit.c
+++ b/net/ipv6/sit.c
@@ -1095,12 +1095,13 @@ tx_err:
 
 static void ipip6_tunnel_bind_dev(struct net_device *dev)
 {
+       struct ip_tunnel *tunnel = netdev_priv(dev);
+       int t_hlen = tunnel->hlen + sizeof(struct iphdr);
        struct net_device *tdev = NULL;
-       struct ip_tunnel *tunnel;
+       int hlen = LL_MAX_HEADER;
        const struct iphdr *iph;
        struct flowi4 fl4;
 
-       tunnel = netdev_priv(dev);
        iph = &tunnel->parms.iph;
 
        if (iph->daddr) {
@@ -1123,14 +1124,15 @@ static void ipip6_tunnel_bind_dev(struct net_device *dev)
                tdev = __dev_get_by_index(tunnel->net, tunnel->parms.link);
 
        if (tdev && !netif_is_l3_master(tdev)) {
-               int t_hlen = tunnel->hlen + sizeof(struct iphdr);
                int mtu;
 
                mtu = tdev->mtu - t_hlen;
                if (mtu < IPV6_MIN_MTU)
                        mtu = IPV6_MIN_MTU;
                WRITE_ONCE(dev->mtu, mtu);
+               hlen = tdev->hard_header_len + tdev->needed_headroom;
        }
+       dev->needed_headroom = t_hlen + hlen;
 }
 
 static void ipip6_tunnel_update(struct ip_tunnel *t, struct ip_tunnel_parm *p,