]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
missing: re-add mistakenly dropped entries
authorYu Watanabe <watanabe.yu+github@gmail.com>
Tue, 4 Dec 2018 00:28:23 +0000 (01:28 +0100)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Tue, 4 Dec 2018 00:45:14 +0000 (01:45 +0100)
These entries are mistakenly dropped by 9714c020fc4cda1823c2a77e3fd08aefa7d78b25.

Fixes #11036.

meson.build
src/basic/missing_fib_rules.h

index ac1cbd7df4f516cd17ea560f81b75a1d182cc6c2..fe19dc63e86e15516d78c675453c60eed0677a46 100644 (file)
@@ -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'],
index a07c91b08ab89d8d7bb8bf2cbdf7fd13e6f98cd1..df120d7bcdaed2afbca0ac12adcf3462bb0ba2c0 100644 (file)
@@ -3,6 +3,15 @@
 
 #include <linux/types.h>
 
+#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