diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2018-06-07 15:49:12 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-07 15:49:12 -0400 |
| commit | 3b72cd11929ac35158e20ca98899e40bc6197f7d (patch) | |
| tree | e8136a7a6ebe10140b8d96485dfee96ff033f873 | |
| parent | 7348e571b7b0e2616726723bb624d3a15be5f40a (diff) | |
| parent | 452c9b503b2698c581182e981ab8a9563615ccc8 (diff) | |
Merge pull request #2382 from opensourcerouting/remove_preprocessor_check
zebra: remove unnecessary preprocessor check
| -rwxr-xr-x | configure.ac | 2 | ||||
| -rw-r--r-- | zebra/if_netlink.c | 4 |
2 files changed, 0 insertions, 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 <linux/if_link.h>]) ;; 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); } |