[ovs-git] [openvswitch/ovs] b943fb: compat: Remove duplicate metadata destination code

gvrose8192 noreply at github.com
Wed Jul 3 18:18:44 UTC 2019


  Branch: refs/heads/master
  Home:   https://github.com/openvswitch/ovs
  Commit: b943fba797e389ed81f442e184788e6f3570d9d2
      https://github.com/openvswitch/ovs/commit/b943fba797e389ed81f442e184788e6f3570d9d2
  Author: Greg Rose <gvrose8192 at gmail.com>
  Date:   2019-07-03 (Wed, 03 Jul 2019)

  Changed paths:
    M datapath/linux/compat/include/net/dst_metadata.h
    M datapath/linux/compat/ip6_gre.c
    M datapath/linux/compat/ip_gre.c

  Log Message:
  -----------
  compat: Remove duplicate metadata destination code

ip_gre.c and ip6_gre.c both had duplicate code for handling the tunnel
metadata destinations.  Move the duplicate code over into the right
header file, dst_metadata.h.

Signed-off-by: Greg Rose <gvrose8192 at gmail.com>
Acked-by: William Tu <u9012063 at gmail.com>
Signed-off-by: Ben Pfaff <blp at ovn.org>


  Commit: 6d97adeea9c7e88fe8d41049453bb212e5fbcd9f
      https://github.com/openvswitch/ovs/commit/6d97adeea9c7e88fe8d41049453bb212e5fbcd9f
  Author: Greg Rose <gvrose8192 at gmail.com>
  Date:   2019-07-03 (Wed, 03 Jul 2019)

  Changed paths:
    M acinclude.m4
    M datapath/linux/compat/gre.c
    M datapath/linux/compat/include/net/gre.h
    M datapath/linux/compat/ip6_gre.c
    M datapath/linux/compat/ip_gre.c

  Log Message:
  -----------
  compat: Clean up gre_calc_hlen

It's proliferated throughout three .c files so let's pull them all
together in gre.h where the inline function belongs. This requires
some adjustments to the compat layer so that the various iterations
of gre_calc_hlen and ip_gre_calc_hlen since the 3.10 kernel are
handled correctly.

Signed-off-by: Greg Rose <gvrose8192 at gmail.com>
Acked-by: William Tu <u9012063 at gmail.com>
Signed-off-by: Ben Pfaff <blp at ovn.org>


  Commit: ec7a138d88b24db77e2142d149b7b42a45eb1cdc
      https://github.com/openvswitch/ovs/commit/ec7a138d88b24db77e2142d149b7b42a45eb1cdc
  Author: Greg Rose <gvrose8192 at gmail.com>
  Date:   2019-07-03 (Wed, 03 Jul 2019)

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

  Log Message:
  -----------
  compat: Clean up tunnel_id_to_key

This function was just a duplicate of tunnel_id_to_key32 - I'm not sure
why it was ever needed but let's dump it now.

Signed-off-by: Greg Rose <gvrose8192 at gmail.com>
Acked-by: William Tu <u9012063 at gmail.com>
Signed-off-by: Ben Pfaff <blp at ovn.org>


Compare: https://github.com/openvswitch/ovs/compare/998bfdccf5c3...ec7a138d88b2


More information about the git mailing list