odp-util: Use FLOW_MAX_MPLS_LABELS when parsing MPLS ODP keys.

[cascardo/ovs.git] / lib / tnl-neigh-cache.c

diff --git a/lib/tnl-neigh-cache.c b/lib/tnl-neigh-cache.c
index cf4082c..0339b52 100644 (file)
--- a/lib/tnl-neigh-cache.c
+++ b/lib/tnl-neigh-cache.c
@@ -80,25 +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_set_mapped_ipv4(&dst6, 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)
@@ -158,9 +139,7 @@ static void
 tnl_arp_set(const char name[IFNAMSIZ], ovs_be32 dst,
             const struct eth_addr mac)
 {
-    struct in6_addr dst6;
-
-    in6_addr_set_mapped_ipv4(&dst6, dst);
+    struct in6_addr dst6 = in6_addr_mapped_ipv4(dst);
     tnl_neigh_set__(name, &dst6, mac);
 }