X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Fdhcp%2Fdhcp6_proxy_node.c;h=33fb8a3799246ad4c68b68c755198232be8264af;hb=refs%2Fchanges%2F28%2F31528%2F4;hp=3231f28b1fd0e373856d8977e0e2a99ec54f4d76;hpb=e65eea360c394429320a45d695ee4d770673b3d4;p=vpp.git

diff --git a/src/plugins/dhcp/dhcp6_proxy_node.c b/src/plugins/dhcp/dhcp6_proxy_node.c
index 3231f28b1fd..33fb8a37992 100644
--- a/src/plugins/dhcp/dhcp6_proxy_node.c
+++ b/src/plugins/dhcp/dhcp6_proxy_node.c
@@ -16,7 +16,6 @@
  */
 
 #include <vlib/vlib.h>
-#include <vnet/pg/pg.h>
 #include <dhcp/dhcp_proxy.h>
 #include <dhcp/dhcp6_packet.h>
 #include <vnet/mfib/mfib_table.h>
@@ -444,7 +443,6 @@ dhcpv6_proxy_to_server_input (vlib_main_t * vm,
 			 DHCPV6_PROXY_ERROR_ALLOC_FAIL, 1);
 		      continue;
 		    }
-		  VLIB_BUFFER_TRACE_TRAJECTORY_INIT (c0);
 		  ci0 = vlib_get_buffer_index (vm, c0);
 		  server = &proxy->dhcp_servers[ii];
 
@@ -785,7 +783,8 @@ dhcpv6_proxy_to_client_input (vlib_main_t * vm,
 
       hi0 = vnet_get_sup_hw_interface (vnm, original_sw_if_index);
       ei0 = pool_elt_at_index (em->interfaces, hi0->hw_instance);
-      clib_memcpy (mac0->src_address, ei0->address, sizeof (ei0->address));
+      clib_memcpy (mac0->src_address, &ei0->address,
+		   sizeof (mac0->src_address));
       clib_memset (&mac0->dst_address, 0xff, sizeof (mac0->dst_address));
 
       if (si0->type == VNET_SW_INTERFACE_TYPE_SUB && outer_vlan != (u32) ~ 0)