lkml.org 
[lkml]   [2018]   [Apr]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 101/102] Revert "ip6_vti: adjust vti mtu according to mtu of lower device"
    Date
    4.9-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    This reverts commit 1139d77d8a7f9aa6b6ae0a1c902f94775dad2f52 which is
    commit 53c81e95df1793933f87748d36070a721f6cb287 upstream.

    Ben writes that there are a number of follow-on patches needed to fix
    this up, but they get complex to backport, and some custom fixes are
    needed, so let's just revert this and wait for a "real" set of patches
    to resolve this to be submitted if it is really needed.

    Reported-by: Ben Hutchings <ben.hutchings@codethink.co.uk>
    Cc: Petr Vorel <pvorel@suse.cz>
    Cc: Alexey Kodanev <alexey.kodanev@oracle.com>
    Cc: David S. Miller <davem@davemloft.net>
    Cc: Stefano Brivio <sbrivio@redhat.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    net/ipv6/ip6_vti.c | 20 --------------------
    1 file changed, 20 deletions(-)

    --- a/net/ipv6/ip6_vti.c
    +++ b/net/ipv6/ip6_vti.c
    @@ -625,7 +625,6 @@ static void vti6_link_config(struct ip6_
    {
    struct net_device *dev = t->dev;
    struct __ip6_tnl_parm *p = &t->parms;
    - struct net_device *tdev = NULL;

    memcpy(dev->dev_addr, &p->laddr, sizeof(struct in6_addr));
    memcpy(dev->broadcast, &p->raddr, sizeof(struct in6_addr));
    @@ -638,25 +637,6 @@ static void vti6_link_config(struct ip6_
    dev->flags |= IFF_POINTOPOINT;
    else
    dev->flags &= ~IFF_POINTOPOINT;
    -
    - if (p->flags & IP6_TNL_F_CAP_XMIT) {
    - int strict = (ipv6_addr_type(&p->raddr) &
    - (IPV6_ADDR_MULTICAST | IPV6_ADDR_LINKLOCAL));
    - struct rt6_info *rt = rt6_lookup(t->net,
    - &p->raddr, &p->laddr,
    - p->link, strict);
    -
    - if (rt)
    - tdev = rt->dst.dev;
    - ip6_rt_put(rt);
    - }
    -
    - if (!tdev && p->link)
    - 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);
    }

    /**

    \
     
     \ /
      Last update: 2018-04-06 15:38    [W:4.185 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site