diff options
author | Ilya Maximets <i.maximets@ovn.org> | 2022-09-26 23:18:48 +0200 |
---|---|---|
committer | Ilya Maximets <i.maximets@ovn.org> | 2022-10-06 21:58:16 +0200 |
commit | 46606cb2d6089dc473025d681a45757343539c6b (patch) | |
tree | 8cbc3bb992a00c446bf677dd7d17a9576b4b5feb | |
parent | 9b1a897e25ab6e96d64bc20ee5b2738d26ae25b1 (diff) | |
download | openvswitch-46606cb2d6089dc473025d681a45757343539c6b.tar.gz |
sparse: Add a guard for netinet/ip6.h header on FreeBSD.
Same as arpa/inet.h, the netinet/ip6.h on FreeBSD requires
netinet/in.h to be included first. So, adding a similar guard.
Also fixing one instance where this is not respected at the moment.
We do have FreeBSD CI these days, but it is still nice to have
a more clear error message.
Fixes: b2befd5bb2db ("sparse: Add guards to prevent FreeBSD-incompatible #include order.")
Acked-by: Mike Pattrick <mkp@redhat.com>
Signed-off-by: Ilya Maximets <i.maximets@ovn.org>
-rw-r--r-- | include/sparse/netinet/ip6.h | 4 | ||||
-rw-r--r-- | lib/netdev-offload-dpdk.c | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/include/sparse/netinet/ip6.h b/include/sparse/netinet/ip6.h index bfa637a46..b2b6f47d9 100644 --- a/include/sparse/netinet/ip6.h +++ b/include/sparse/netinet/ip6.h @@ -18,6 +18,10 @@ #error "Use this header only with sparse. It is not a correct implementation." #endif +#ifndef NETINET_IN_H_INCLUDED +#error "Must include <netinet/in.h> before <netinet/ip6.h> for FreeBSD support" +#endif + #ifndef __NETINET_IP6_SPARSE #define __NETINET_IP6_SPARSE 1 diff --git a/lib/netdev-offload-dpdk.c b/lib/netdev-offload-dpdk.c index cceefbc50..80a64a6cc 100644 --- a/lib/netdev-offload-dpdk.c +++ b/lib/netdev-offload-dpdk.c @@ -17,6 +17,7 @@ #include <config.h> #include <sys/types.h> +#include <netinet/in.h> #include <netinet/ip6.h> #include <rte_ethdev.h> #include <rte_flow.h> |