[ovs-git] [openvswitch/ovs] f689fe: ip_gre: fix IFLA_MTU ignored on NEWLINK

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/openvswitch/ovs
  Commit: f689fe1e9706fb0b5817cb6ff5c20941dd5295b7
      https://github.com/openvswitch/ovs/commit/f689fe1e9706fb0b5817cb6ff5c20941dd5295b7
  Author: Xin Long <lucien.xin at gmail.com>
  Date:   2018-08-07 (Tue, 07 Aug 2018)

  Changed paths:
    M datapath/linux/compat/ip_gre.c

  Log Message:
  -----------
  ip_gre: fix IFLA_MTU ignored on NEWLINK

Upstream commit:
    From: Xin Long <lucien.xin at gmail.com>
    Date: Tue, 27 Feb 2018 19:19:39 +0800
    Subject: [PATCH] ip_gre: fix IFLA_MTU ignored on NEWLINK

    It's safe to remove the setting of dev's needed_headroom and mtu in
    __gre_tunnel_init, as discussed in [1], ip_tunnel_newlink can do it
    properly.

    Now Eric noticed that it could cover the mtu value set in do_setlink
    when creating a ip_gre dev. It makes IFLA_MTU param not take effect.

    So this patch is to remove them to make IFLA_MTU work, as in other
    ipv4 tunnels.

      [1]: https://patchwork.ozlabs.org/patch/823504/

    Fixes: c54419321455 ("GRE: Refactor GRE tunneling code.")
    Reported-by: Eric Garver <e at erig.me>
    Signed-off-by: Xin Long <lucien.xin at gmail.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

Part of this commit already made it into __gre_tunnel_init but
the piece for erspan_tunnel_init did not make it in so fix that
now.

Cc: Xin Long <lucien.xin at gmail.com>
Signed-off-by: Greg Rose <gvrose8192 at gmail.com>
Signed-off-by: Ben Pfaff <blp at ovn.org>


  Commit: 274e04f98287c59d2a5c5dd90b820b066b529162
      https://github.com/openvswitch/ovs/commit/274e04f98287c59d2a5c5dd90b820b066b529162
  Author: YueHaibing <yuehaibing at huawei.com>
  Date:   2018-08-07 (Tue, 07 Aug 2018)

  Changed paths:
    M datapath/linux/compat/ip_gre.c

  Log Message:
  -----------
  ip_gre: remove redundant variables t_hlen

Upstream commit:
    From: YueHaibing <yuehaibing at huawei.com>
    Date: Wed, 1 Aug 2018 10:04:02 +0800
    Subject: [PATCH] ip_gre: remove redundant variables t_hlen

    After commit ffc2b6ee4174 ("ip_gre: fix IFLA_MTU ignored on NEWLINK")
    variable t_hlen is assigned values that are never read,
    hence they are redundant and can be removed.

    Signed-off-by: YueHaibing <yuehaibing at huawei.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

Cc: YueHaibing <yuehaibing at huawei.com>
Signed-off-by: Greg Rose <gvrose8192 at gmail.com>
Signed-off-by: Ben Pfaff <blp at ovn.org>


Compare: https://github.com/openvswitch/ovs/compare/f0b8971ab925...274e04f98287
      **NOTE:** This service has been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.