diff options
| author | Renato Westphal <renato@opensourcerouting.org> | 2018-06-07 20:45:33 +0200 |
|---|---|---|
| committer | Renato Westphal <renato@opensourcerouting.org> | 2018-06-07 20:45:33 +0200 |
| commit | 452c9b503b2698c581182e981ab8a9563615ccc8 (patch) | |
| tree | e8136a7a6ebe10140b8d96485dfee96ff033f873 /zebra/if_netlink.c | |
| parent | Merge pull request #2335 from donaldsharp/bgp_memory_hooliganism (diff) | |
| download | frr-452c9b503b2698c581182e981ab8a9563615ccc8.tar.xz frr-452c9b503b2698c581182e981ab8a9563615ccc8.zip | |
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 <renato@opensourcerouting.org>
Diffstat (limited to '')
| -rw-r--r-- | zebra/if_netlink.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/zebra/if_netlink.c b/zebra/if_netlink.c index f153cc351..e6d324ab6 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); } |