[ovs-git] [openvswitch/ovs] de4a61: tc: Fix compile with Glibc < 2.24 and Linux > 4.5.

GitHub noreply at github.com
Mon Jun 19 23:08:34 UTC 2017


  Branch: refs/heads/master
  Home:   https://github.com/openvswitch/ovs
  Commit: de4a611f9ccbdcc3f572f59e548aa00486eaa2af
      https://github.com/openvswitch/ovs/commit/de4a611f9ccbdcc3f572f59e548aa00486eaa2af
  Author: Joe Stringer <joe at ovn.org>
  Date:   2017-06-19 (Mon, 19 Jun 2017)

  Changed paths:
    M lib/tc.h

  Log Message:
  -----------
  tc: Fix compile with Glibc < 2.24 and Linux > 4.5.

linux/pkt_cls.h indirectly includes linux/stddef.h, which may define
__always_inline when using Linux kernel headers 4.6 or later.

netinet/in.h indirectly includes sys/cdefs.h, which before Glibc 2.24
would unconditionally define __always_inline.

This combination of headers causes compilation failure. Resolve the
issue by placing the netinet/in.h include above linux/pkt_cls.h.

Sourceware-BZ: #20215.
Fixes: f98e418fbdb6 ("tc: Add tc flower functions")
Signed-off-by: Joe Stringer <joe at ovn.org>
Tested-by: Greg Rose <gvrose8192 at gmail.com>
Acked-by: Greg Rose <gvrose8192 at gmail.com>


  Commit: ef3767f5c6d34938a22e0377f5832096187063a4
      https://github.com/openvswitch/ovs/commit/ef3767f5c6d34938a22e0377f5832096187063a4
  Author: Joe Stringer <joe at ovn.org>
  Date:   2017-06-19 (Mon, 19 Jun 2017)

  Changed paths:
    M lib/netdev-linux.c
    M lib/netdev-tc-offloads.c
    M lib/tc.c
    M lib/tc.h

  Log Message:
  -----------
  tc: Tidy up includes.

Fix minor style variations and unnecessary includes.

Signed-off-by: Joe Stringer <joe at ovn.org>
Tested-by: Greg Rose <gvrose8192 at gmail.com>
Acked-by: Greg Rose <gvrose8192 at gmail.com>


Compare: https://github.com/openvswitch/ovs/compare/2a85b7cc8137...ef3767f5c6d3


More information about the git mailing list