From 2dd6852d8109e39d15a5c60f7ba58f1abcf9e455 Mon Sep 17 00:00:00 2001
From: Neale Ranns <nranns@cisco.com>
Date: Thu, 16 Feb 2017 03:38:59 -0800
Subject: Consolidate DHCP v4 and V6 implementation. No functional change
 intended

The DHCP proxy and VSS information maintained by VPP is the same for v4 and v6, so we can manage this state using the same code.
Packet handling is cleary different, so this is kept separate.

Change-Id: I10f10cc1f7f19debcd4c4b099c6de64e56bb0c69
Signed-off-by: Neale Ranns <nranns@cisco.com>
---
 src/vpp/api/custom_dump.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src/vpp/api/custom_dump.c')

diff --git a/src/vpp/api/custom_dump.c b/src/vpp/api/custom_dump.c
index 70b4e4c9..4cc6aa73 100644
--- a/src/vpp/api/custom_dump.c
+++ b/src/vpp/api/custom_dump.c
@@ -21,8 +21,7 @@
 #include <vnet/ip/ip.h>
 #include <vnet/unix/tuntap.h>
 #include <vnet/mpls/mpls.h>
-#include <vnet/dhcp/proxy.h>
-#include <vnet/dhcpv6/proxy.h>
+#include <vnet/dhcp/dhcp_proxy.h>
 #include <vnet/l2tp/l2tp.h>
 #include <vnet/l2/l2_input.h>
 #include <vnet/sr/sr_packet.h>
-- 
cgit 1.2.3-korg