X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Fdhcp%2Fdhcp6_client_common_dp.c;h=da6f61aa2d50c17ad01668bcd52a5b7091ad3749;hb=8e1384f7bf2e806e0d65d07af38da269ef1b8338;hp=e42ec3f472c4fa17be79e0ded71d328457fadcd9;hpb=02bfd641b69aab83397e217b9ca4e35a6aab05c8;p=vpp.git

diff --git a/src/plugins/dhcp/dhcp6_client_common_dp.c b/src/plugins/dhcp/dhcp6_client_common_dp.c
index e42ec3f472c..da6f61aa2d5 100644
--- a/src/plugins/dhcp/dhcp6_client_common_dp.c
+++ b/src/plugins/dhcp/dhcp6_client_common_dp.c
@@ -19,7 +19,8 @@
 #include <dhcp/dhcp6_ia_na_client_dp.h>
 #include <dhcp/dhcp6_pd_client_dp.h>
 #include <dhcp/dhcp6_packet.h>
-#include <vnet/udp/udp.h>
+#include <vnet/udp/udp_local.h>
+#include <vnet/udp/udp_packet.h>
 
 dhcp6_client_common_main_t dhcp6_client_common_main;
 dhcpv6_duid_ll_string_t client_duid;
@@ -61,16 +62,16 @@ generate_client_duid (void)
   ethernet_interface_t *eth_if = 0;
 
   /* *INDENT-OFF* */
-  pool_foreach (hi, im->hw_interfaces,
-  ({
+  pool_foreach (hi, im->hw_interfaces)
+   {
     eth_if = ethernet_get_interface (&ethernet_main, hi->hw_if_index);
     if (eth_if)
       break;
-  }));
+  }
   /* *INDENT-ON* */
 
   if (eth_if)
-    clib_memcpy (client_duid.lla, eth_if->address, 6);
+    clib_memcpy (client_duid.lla, &eth_if->address, 6);
   else
     {
       clib_warning ("Failed to find any Ethernet interface, "