From 37029305c671f4e2d091d6f6c22142634e409043 Mon Sep 17 00:00:00 2001
From: Neale Ranns <nranns@cisco.com>
Date: Fri, 10 Aug 2018 05:30:06 -0700
Subject: Use IP and MAC API types for neighbors

use address_t and mac_address_t for IPv6 and ARP entries
and all other API calls in ip.api aprat from the route ones,
that will follow in a separate commit

Change-Id: I67161737c2184d3f8fc1e79ebd2b55121c5b0191
Signed-off-by: Neale Ranns <nranns@cisco.com>
---
 src/plugins/mactime/mactime.c | 3 +--
 src/plugins/mactime/mactime.h | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'src/plugins/mactime')

diff --git a/src/plugins/mactime/mactime.c b/src/plugins/mactime/mactime.c
index 837b317027d..572b913ba07 100644
--- a/src/plugins/mactime/mactime.c
+++ b/src/plugins/mactime/mactime.c
@@ -553,8 +553,7 @@ show_mactime_command_fn (vlib_main_t * vm,
       for (j = 0; j < vec_len (mm->arp_cache_copy); j++)
 	{
 	  n = mm->arp_cache_copy + j;
-	  if (!memcmp (dp->mac_address, n->ethernet_address,
-		       sizeof (n->ethernet_address)))
+	  if (!memcmp (dp->mac_address, n->mac.bytes, sizeof (n->mac)))
 	    {
 	      vlib_cli_output (vm, "%17s%U", " ", format_ip4_address,
 			       &n->ip4_address);
diff --git a/src/plugins/mactime/mactime.h b/src/plugins/mactime/mactime.h
index 1a13e41f606..8d4165212a4 100644
--- a/src/plugins/mactime/mactime.h
+++ b/src/plugins/mactime/mactime.h
@@ -21,7 +21,7 @@
 #include <vnet/vnet.h>
 #include <vnet/ip/ip.h>
 #include <vnet/ethernet/ethernet.h>
-#include <vnet/ethernet/arp_packet.h>
+#include <vnet/ethernet/arp.h>
 #include <vlib/counter.h>
 
 #include <vppinfra/hash.h>
-- 
cgit 1.2.3-korg