shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-02 02:21:44 +03:00
Code

Merge pull request #11039 from yuwata/fix-11036

Browse Source 
missing: re-add mistakenly dropped entries
This commit is contained in:
Yu Watanabe 2018-12-04 13:48:47 +09:00 committed by GitHub
commit b1c7e54ad7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meson.build
View 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_1000baseX_Full_BIT', 'linux/ethtool.h'],
['ETHTOOL_LINK_MODE_2500baseT_Full_BIT', 'linux/ethtool.h'], ['ETHTOOL_LINK_MODE_2500baseT_Full_BIT', 'linux/ethtool.h'],
['ETHTOOL_LINK_MODE_FEC_NONE_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_PAD', 'linux/fib_rules.h'],
['FRA_L3MDEV', 'linux/fib_rules.h'], ['FRA_L3MDEV', 'linux/fib_rules.h'],
['FRA_UID_RANGE', 'linux/fib_rules.h'], ['FRA_UID_RANGE', 'linux/fib_rules.h'],

9
src/basic/missing_fib_rules.h
View File

@ -3,6 +3,15 @@
#include <linux/types.h> #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) */ #if !HAVE_FRA_PAD /* linux@b46f6ded906ef0be52a4881ba50a084aeca64d7e (4.7) */
#define FRA_PAD 18 #define FRA_PAD 18
#endif #endif

17
src/basic/missing_if_link.h
View File

@ -20,7 +20,7 @@ enum in6_addr_gen_mode {
#if !HAVE_IN6_ADDR_GEN_MODE_RANDOM /* linux@cc9da6cc4f56e05cc9e591459fe0192727ff58b3 (4.5) */ #if !HAVE_IN6_ADDR_GEN_MODE_RANDOM /* linux@cc9da6cc4f56e05cc9e591459fe0192727ff58b3 (4.5) */
#define IN6_ADDR_GEN_MODE_RANDOM 3 #define IN6_ADDR_GEN_MODE_RANDOM 3
#endif #endif
#endif #endif /* !HAVE_IFLA_INET6_ADDR_GEN_MODE */
#if !HAVE_IFLA_IPVLAN_MODE /* linux@2ad7bf3638411cb547f2823df08166c13ab04269 (3.19) */ #if !HAVE_IFLA_IPVLAN_MODE /* linux@2ad7bf3638411cb547f2823df08166c13ab04269 (3.19) */
enum { enum {
@ -41,15 +41,22 @@ enum ipvlan_mode {
#define IPVLAN_MODE_L3S 2 #define IPVLAN_MODE_L3S 2
#define IPVLAN_MODE_MAX 3 #define IPVLAN_MODE_MAX 3
#endif #endif
#if !HAVE_IFLA_IPVLAN_FLAGS /* linux@a190d04db93710ae166749055b6985397c6d13f5, fe89aa6b250c1011ccf425fbb7998e96bd54263f (4.15) */ #if !HAVE_IFLA_IPVLAN_FLAGS /* linux@a190d04db93710ae166749055b6985397c6d13f5 (4.15) */
#define IFLA_IPVLAN_FLAGS 2 #define IFLA_IPVLAN_FLAGS 2
#undef IFLA_IPVLAN_MAX #undef IFLA_IPVLAN_MAX
#define IFLA_IPVLAN_MAX 2 #define IFLA_IPVLAN_MAX 2
#define IPVLAN_F_PRIVATE 0x01
#define IPVLAN_F_VEPA 0x02
#endif #endif
#endif /* !HAVE_IFLA_IPVLAN_MODE */
/* linux@a190d04db93710ae166749055b6985397c6d13f5 (4.15) */
#ifndef IPVLAN_F_PRIVATE
#define IPVLAN_F_PRIVATE 0x01
#endif
/* linux@fe89aa6b250c1011ccf425fbb7998e96bd54263f (4.15) */
#ifndef IPVLAN_F_VEPA
#define IPVLAN_F_VEPA 0x02
#endif #endif
#if !HAVE_IFLA_PHYS_PORT_ID /* linux@66cae9ed6bc46b8cc57a9693f99f69926f3cc7ef (3.12) */ #if !HAVE_IFLA_PHYS_PORT_ID /* linux@66cae9ed6bc46b8cc57a9693f99f69926f3cc7ef (3.12) */