From 6b99b4f8c987614d27c0729833c0c97e657b5657 Mon Sep 17 00:00:00 2001 From: Thadeu Lima de Souza Cascardo Date: Fri, 4 Dec 2015 12:36:49 -0200 Subject: [PATCH 1/1] tnl-neigh-cache: Remove tnl_arp_lookup(). tnl_arp_lookup is not used anymore. All users have been converted to IPv4-mapped addresses. New users need to use IPv4-mapped addresses and use tnl_neigh_lookup. Signed-off-by: Thadeu Lima de Souza Cascardo Signed-off-by: Ben Pfaff --- lib/tnl-neigh-cache.c | 17 ----------------- lib/tnl-neigh-cache.h | 2 -- 2 files changed, 19 deletions(-) diff --git a/lib/tnl-neigh-cache.c b/lib/tnl-neigh-cache.c index 1ded16931..0339b5233 100644 --- a/lib/tnl-neigh-cache.c +++ b/lib/tnl-neigh-cache.c @@ -80,23 +80,6 @@ tnl_neigh_lookup__(const char br_name[IFNAMSIZ], const struct in6_addr *dst) return NULL; } -int -tnl_arp_lookup(const char br_name[IFNAMSIZ], ovs_be32 dst, - struct eth_addr *mac) -{ - struct tnl_neigh_entry *neigh; - int res = ENOENT; - struct in6_addr dst6 = in6_addr_mapped_ipv4(dst); - - neigh = tnl_neigh_lookup__(br_name, &dst6); - if (neigh) { - *mac = neigh->mac; - res = 0; - } - - return res; -} - int tnl_neigh_lookup(const char br_name[IFNAMSIZ], const struct in6_addr *dst, struct eth_addr *mac) diff --git a/lib/tnl-neigh-cache.h b/lib/tnl-neigh-cache.h index a9acd9ede..fee8e6a6f 100644 --- a/lib/tnl-neigh-cache.h +++ b/lib/tnl-neigh-cache.h @@ -38,6 +38,4 @@ int tnl_neigh_lookup(const char dev_name[], const struct in6_addr *dst, void tnl_neigh_cache_init(void); void tnl_neigh_cache_run(void); -int tnl_arp_lookup(const char dev_name[], ovs_be32 dst, struct eth_addr *mac); - #endif -- 2.20.1