From b6459df80fb48cfa16aab44249a60da05b7ce656 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Tue, 4 Dec 2018 01:28:23 +0100 Subject: [PATCH] missing: re-add mistakenly dropped entries These entries are mistakenly dropped by 9714c020fc4cda1823c2a77e3fd08aefa7d78b25. Fixes #11036. --- meson.build | 2 ++ src/basic/missing_fib_rules.h | 9 +++++++++ 2 files changed, 11 insertions(+) diff --git a/meson.build b/meson.build index ac1cbd7df4f..fe19dc63e86 100644 --- a/meson.build +++ b/meson.build @@ -456,6 +456,8 @@ foreach decl : [['ETHTOOL_LINK_MODE_10baseT_Half_BIT', 'linux/ethtool.h'], ['ETHTOOL_LINK_MODE_1000baseX_Full_BIT', 'linux/ethtool.h'], ['ETHTOOL_LINK_MODE_2500baseT_Full_BIT', 'linux/ethtool.h'], ['ETHTOOL_LINK_MODE_FEC_NONE_BIT', 'linux/ethtool.h'], + ['FRA_TUN_ID', 'linux/fib_rules.h'], + ['FRA_SUPPRESS_PREFIXLEN', 'linux/fib_rules.h'], ['FRA_PAD', 'linux/fib_rules.h'], ['FRA_L3MDEV', 'linux/fib_rules.h'], ['FRA_UID_RANGE', 'linux/fib_rules.h'], diff --git a/src/basic/missing_fib_rules.h b/src/basic/missing_fib_rules.h index a07c91b08ab..df120d7bcda 100644 --- a/src/basic/missing_fib_rules.h +++ b/src/basic/missing_fib_rules.h @@ -3,6 +3,15 @@ #include +#if !HAVE_FRA_TUN_ID /* linux@e7030878fc8448492b6e5cecd574043f63271298 (4.3) */ +#define FRA_TUN_ID 12 +#endif + +#if !HAVE_FRA_SUPPRESS_PREFIXLEN /* linux@6ef94cfafba159d6b1a902ccb3349ac6a34ff6ad, 73f5698e77219bfc3ea1903759fe8e20ab5b285e (3.12) */ +#define FRA_SUPPRESS_IFGROUP 13 +#define FRA_SUPPRESS_PREFIXLEN 14 +#endif + #if !HAVE_FRA_PAD /* linux@b46f6ded906ef0be52a4881ba50a084aeca64d7e (4.7) */ #define FRA_PAD 18 #endif