Merge pull request #10477 from yuwata/fix-10474

network: include linux/fou.h if it exists

meson.build

@@ -476,7 +476,6 @@ foreach decl : [['IFLA_INET6_ADDR_GEN_MODE',         'linux/if_link.h'],
                 ['VXCAN_INFO_PEER',                  'linux/can/vxcan.h'],
                 ['FOU_ATTR_REMCSUM_NOPARTIAL',       'linux/fou.h'],
                 ['FOU_CMD_GET',                      'linux/fou.h'],
-                ['FOU_ENCAP_GUE',                    'linux/fou.h'],
                ]
         prefix = decl.length() > 2 ? decl[2] : ''
         have = cc.has_header_symbol(decl[1], decl[0], prefix : prefix)
@@ -608,6 +607,7 @@ if not cc.has_header('sys/capability.h')
 endif
 foreach header : ['crypt.h',
                   'linux/btrfs.h',
+                  'linux/fou.h',
                   'linux/memfd.h',
                   'linux/vm_sockets.h',
                   'sys/auxv.h',

src/basic/missing.h

@@ -1417,33 +1417,39 @@ struct statx {
 #define FOU_GENL_VERSION        0x1
 #endif
 
+#if !HAVE_LINUX_FOU_H
+#define FOU_ATTR_UNSPEC            0
+#define FOU_ATTR_PORT              1
+#define FOU_ATTR_AF                2
+#define FOU_ATTR_IPPROTO           3
+#define FOU_ATTR_TYPE              4
+#endif
 #if !HAVE_FOU_ATTR_REMCSUM_NOPARTIAL
-#define FOU_ATTR_UNSPEC 0
-#define FOU_ATTR_PORT 1
-#define FOU_ATTR_AF 2
-#define FOU_ATTR_IPPROTO 3
-#define FOU_ATTR_TYPE 4
 #define FOU_ATTR_REMCSUM_NOPARTIAL 5
-#define __FOU_ATTR_MAX 6
-
-#define FOU_ATTR_MAX (__FOU_ATTR_MAX - 1)
+#undef  FOU_ATTR_MAX
+#endif
+#ifndef FOU_ATTR_MAX
+#define FOU_ATTR_MAX               5
 #endif
 
+#if !HAVE_LINUX_FOU_H
+#define FOU_CMD_UNSPEC             0
+#define FOU_CMD_ADD                1
+#define FOU_CMD_DEL                2
+#endif
 #if !HAVE_FOU_CMD_GET
-#define FOU_CMD_UNSPEC 0
-#define FOU_CMD_ADD 1
-#define FOU_CMD_DEL 2
-#define FOU_CMD_GET 3
-#define __FOU_CMD_MAX 4
-
-#define FOU_CMD_MAX (__FOU_CMD_MAX - 1)
+#define FOU_CMD_GET                3
+#undef  FOU_CMD_MAX
+#endif
+#ifndef FOU_CMD_MAX
+#define FOU_CMD_MAX                3
 #endif
 
-#if !HAVE_FOU_ENCAP_GUE
-#define FOU_ENCAP_UNSPEC 0
-#define FOU_ENCAP_DIRECT 1
-#define FOU_ENCAP_GUE 2
-#define __FOU_ENCAP_MAX 3
+#if !HAVE_LINUX_FOU_H
+#define FOU_ENCAP_UNSPEC           0
+#define FOU_ENCAP_DIRECT           1
+#define FOU_ENCAP_GUE              2
+#define __FOU_ENCAP_MAX            3
 
 #define FOU_ENCAP_MAX (__FOU_ENCAP_MAX - 1)
 #endif

src/libsystemd/sd-netlink/netlink-types.c

@@ -17,7 +17,7 @@
 #include <linux/if_tunnel.h>
 #include <linux/veth.h>
 
-#if HAVE_FOU_CMD_GET
+#if HAVE_LINUX_FOU_H
 #include <linux/fou.h>
 #endif
 

src/network/netdev/fou-tunnel.h

@@ -1,11 +1,12 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-#if HAVE_FOU_CMD_GET
+#if HAVE_LINUX_FOU_H
 #include <linux/fou.h>
 #endif
 
 #include "in-addr-util.h"
+#include "missing.h"
 #include "netdev/netdev.h"
 
 typedef enum FooOverUDPEncapType {

src/network/netdev/tunnel.c

@@ -6,12 +6,12 @@
 #include <linux/if_tunnel.h>
 #include <linux/ip6_tunnel.h>
 
-#include "sd-netlink.h"
-
-#if HAVE_FOU_CMD_GET
+#if HAVE_LINUX_FOU_H
 #include <linux/fou.h>
 #endif
 
+#include "sd-netlink.h"
+
 #include "conf-parser.h"
 #include "missing.h"
 #include "networkd-link.h"