From 452c9b503b2698c581182e981ab8a9563615ccc8 Mon Sep 17 00:00:00 2001 From: Renato Westphal Date: Thu, 7 Jun 2018 15:45:33 -0300 Subject: [PATCH] zebra: remove unnecessary preprocessor check The IFLA_INFO_SLAVE_KIND constant is always defined now that we imported our own copies of the Linux kernel headers. Remove the preprocessor checks since they aren't necessary anymore. Signed-off-by: Renato Westphal --- configure.ac | 2 -- zebra/if_netlink.c | 4 ---- 2 files changed, 6 deletions(-) diff --git a/configure.ac b/configure.ac index 7c7de19e1f..35997a87ec 100755 --- a/configure.ac +++ b/configure.ac @@ -920,8 +920,6 @@ case "$host_os" in dnl how to fix it but no real progress on implementation dnl when they fix it, remove this AC_DEFINE(IPV6_MINHOPCOUNT, 73, Linux ipv6 Min Hop Count) - - AC_CHECK_DECLS([IFLA_INFO_SLAVE_KIND], [], [], [#include ]) ;; openbsd*) AC_MSG_RESULT([OpenBSD]) diff --git a/zebra/if_netlink.c b/zebra/if_netlink.c index f153cc3510..e6d324ab6a 100644 --- a/zebra/if_netlink.c +++ b/zebra/if_netlink.c @@ -619,10 +619,8 @@ static int netlink_interface(struct nlmsghdr *h, ns_id_t ns_id, int startup) if (linkinfo[IFLA_INFO_KIND]) kind = RTA_DATA(linkinfo[IFLA_INFO_KIND]); -#if HAVE_DECL_IFLA_INFO_SLAVE_KIND if (linkinfo[IFLA_INFO_SLAVE_KIND]) slave_kind = RTA_DATA(linkinfo[IFLA_INFO_SLAVE_KIND]); -#endif netlink_determine_zebra_iftype(kind, &zif_type); } @@ -1137,10 +1135,8 @@ int netlink_link_change(struct nlmsghdr *h, ns_id_t ns_id, int startup) if (linkinfo[IFLA_INFO_KIND]) kind = RTA_DATA(linkinfo[IFLA_INFO_KIND]); -#if HAVE_DECL_IFLA_INFO_SLAVE_KIND if (linkinfo[IFLA_INFO_SLAVE_KIND]) slave_kind = RTA_DATA(linkinfo[IFLA_INFO_SLAVE_KIND]); -#endif netlink_determine_zebra_iftype(kind, &zif_type); } -- 2.39.5