[ovs-git] [openvswitch/ovs] edc3af: compat: Explicitly include net/ip.h in net/udp.h.

GitHub noreply at github.com
Mon Nov 23 18:59:39 UTC 2015


  Branch: refs/heads/master
  Home:   https://github.com/openvswitch/ovs
  Commit: edc3afe2f1d011363213efb3840ab417d8130c5a
      https://github.com/openvswitch/ovs/commit/edc3afe2f1d011363213efb3840ab417d8130c5a
  Author: Joe Stringer <joestringer at nicira.com>
  Date:   2015-11-23 (Mon, 23 Nov 2015)

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

  Log Message:
  -----------
  compat: Explicitly include net/ip.h in net/udp.h.

The inet_get_local_port_range() function is defined as a 3-parameter
version in the backported net/ip.h, however some versions of RHEL7
kernel use the 2-parameter version in their net/udp.h header. We need to
make sure that our net/ip.h is first included, then undef our overriding
3-parameter version, include the system net/udp.h, then redefine our
overriding 3-parameter version so that it may be used inside OVS code.

This header needs to include net/ip.h here as some files may not include
it prior to net/udp.h, in which case the logic we have to define the
right version while including the system net/udp.h will not work.

Specifically this fixes issues on kernel 3.10.0-229.7.2.el7.x86_64
(perhaps earlier as well; some later versions make this unnecessary).

Signed-off-by: Joe Stringer <joestringer at nicira.com>
Acked-by: Pravin B Shelar <pshelar at nicira.com>




More information about the git mailing list