| From 9ab48a9b3bfadca4fbe055ddb4f6fc677ee4ae85 Mon Sep 17 00:00:00 2001 |
| From: Fabrice Fontaine <fontaine.fabrice@gmail.com> |
| Date: Fri, 11 Jan 2019 17:08:48 +0100 |
| Subject: [PATCH] missing_if_link.h: add IFLA_BOND_MODE |
| |
| systemd fails to build on kernel without IFLA_BOND_MODE (< 3.13) since |
| https://github.com/systemd/systemd/commit/9714c020fc4cda1823c2a77e3fd08aefa7d78b25 |
| |
| So put back IFLA_BOND_MODE definition |
| |
| Fixes: |
| - http://autobuild.buildroot.org/results/699c078aa078240c6741da4dbd0871450ceeca92 |
| |
| Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> |
| [Upstream status: https://github.com/systemd/systemd/pull/11400] |
| --- |
| meson.build | 1 + |
| src/basic/missing_if_link.h | 3 +++ |
| 2 files changed, 4 insertions(+) |
| |
| diff --git a/meson.build b/meson.build |
| index 623c1ad6b..011e44980 100644 |
| --- a/meson.build |
| +++ b/meson.build |
| @@ -476,6 +476,7 @@ foreach decl : [['ETHTOOL_LINK_MODE_10baseT_Half_BIT', 'linux/ethtool.h'], |
| ['IFLA_TARGET_NETNSID', 'linux/if_link.h'], |
| ['IFLA_NEW_IFINDEX', 'linux/if_link.h'], |
| ['IFLA_MAX_MTU', 'linux/if_link.h'], |
| + ['IFLA_BOND_MODE', 'linux/if_link.h'], |
| ['IFLA_BOND_ACTIVE_SLAVE', 'linux/if_link.h'], |
| ['IFLA_BOND_AD_INFO', 'linux/if_link.h'], |
| ['IFLA_BOND_AD_ACTOR_SYSTEM', 'linux/if_link.h'], |
| diff --git a/src/basic/missing_if_link.h b/src/basic/missing_if_link.h |
| index 07675426b..761797f56 100644 |
| --- a/src/basic/missing_if_link.h |
| +++ b/src/basic/missing_if_link.h |
| @@ -110,6 +110,9 @@ enum ipvlan_mode { |
| #define IFLA_MAX 51 |
| #endif |
| |
| +#if !HAVE_IFLA_BOND_MODE /* linux@90af231106c0b8d223c27d35464af95cb3d9cacf (3.13) */ |
| +#define IFLA_BOND_MODE 1 |
| +#endif |
| #if !HAVE_IFLA_BOND_ACTIVE_SLAVE /* linux@ec76aa49855f6d6fea5e01de179fb57dd47c619d (3.13) */ |
| #define IFLA_BOND_ACTIVE_SLAVE 2 |
| #endif |
| -- |
| 2.14.1 |
| |
