[ovs-git] [openvswitch/ovs] bc2e74: datapath: define compat ip_tunnel_get_iflink()

[GitHub]

  Branch: refs/heads/branch-2.5
  Home:   https://github.com/openvswitch/ovs
  Commit: bc2e744219fc46cbb823a646357398fc05675a7d
      https://github.com/openvswitch/ovs/commit/bc2e744219fc46cbb823a646357398fc05675a7d
  Author: Pravin B Shelar <pshelar at nicira.com>
  Date:   2015-12-11 (Fri, 11 Dec 2015)

  Changed paths:
    M datapath/linux/compat/include/net/ip_tunnels.h
    M datapath/linux/compat/ip_tunnel.c

  Log Message:
  -----------
  datapath: define compat ip_tunnel_get_iflink()

ip_tunnel_get_iflink() depends on ip_tunnel structure. But OVS
compat layer defines its own ip_tunnel structure which is not
compatible with all upstream kernel versions. Therefore we
can no use such function.

Signed-off-by: Pravin B Shelar <pshelar at nicira.com>
Acked-by: Jesse Gross <jesse at kernel.org>


  Commit: 71bfe2fdba7334259d2d10dd7a2410cc7367c1c4
      https://github.com/openvswitch/ovs/commit/71bfe2fdba7334259d2d10dd7a2410cc7367c1c4
  Author: Pravin B Shelar <pshelar at nicira.com>
  Date:   2015-12-11 (Fri, 11 Dec 2015)

  Changed paths:
    M datapath/linux/compat/include/net/ip_tunnels.h
    M datapath/linux/compat/ip_tunnel.c

  Log Message:
  -----------
  datapath: define compat ip_tunnel_get_link_net()

Same as ip_tunnel_get_iflink(), function ip_tunnel_get_link_net()
also depends on ip_tunnel structure. So this patch defines
compat implementation for same.

Signed-off-by: Pravin B Shelar <pshelar at nicira.com>
Acked-by: Jesse Gross <jesse at kernel.org>


  Commit: cd4d9378f9768d03109e59c18130677f6c0b8c99
      https://github.com/openvswitch/ovs/commit/cd4d9378f9768d03109e59c18130677f6c0b8c99
  Author: Pravin B Shelar <pshelar at nicira.com>
  Date:   2015-12-11 (Fri, 11 Dec 2015)

  Changed paths:
    M datapath/linux/compat/include/net/gre.h
    M datapath/linux/compat/include/net/ip_tunnels.h

  Log Message:
  -----------
  datapath: compat: Block upstream ip_tunnels functions.

Since upstream and compat ip_tunnel structures are not same, we can not
use exported upstream functions.
Following patch blocks definitions which used ip_tunnel internal
structure. Function which do not depend on these structures are
allows by explicitly by defining it in the header files. e.g.
iptunnel_handle_offloads(), iptunnel_pull_header(). etc.

Signed-off-by: Pravin B Shelar <pshelar at nicira.com>
Acked-by: Jesse Gross <jesse at kernel.org>


Compare: https://github.com/openvswitch/ovs/compare/da9f65ac1be4...cd4d9378f976