From 137c7c612641b5056bc20e64e8ef75df0c775629 Mon Sep 17 00:00:00 2001 From: Damjan Marion Date: Wed, 6 Jul 2016 22:52:49 +0200 Subject: Retire PLATFORM=virl Change-Id: Iaf9735258f456574534c1a581b983326badea171 Signed-off-by: Damjan Marion --- vnet/Makefile.am | 2 +- vnet/configure.ac | 8 -------- vnet/vnet/devices/dpdk/dpdk.h | 2 +- 3 files changed, 2 insertions(+), 10 deletions(-) (limited to 'vnet') diff --git a/vnet/Makefile.am b/vnet/Makefile.am index dcea38fb..47e14b73 100644 --- a/vnet/Makefile.am +++ b/vnet/Makefile.am @@ -13,7 +13,7 @@ AUTOMAKE_OPTIONS = foreign subdir-objects -AM_CFLAGS = -Wall @DPDK@ @VIRL@ @IPSEC@ @IPV6SR@ +AM_CFLAGS = -Wall @DPDK@ @IPSEC@ @IPV6SR@ libvnet_la_SOURCES = libvnetplugin_la_SOURCES = diff --git a/vnet/configure.ac b/vnet/configure.ac index 9afae520..439e5c68 100644 --- a/vnet/configure.ac +++ b/vnet/configure.ac @@ -14,11 +14,6 @@ AC_ARG_WITH(dpdk, [with_dpdk=1], [with_dpdk=0]) -AC_ARG_WITH(virl, - AC_HELP_STRING([--with-virl],[Compile for virl citizenship]), - [with_virl=1], - [with_virl=0]) - AC_ARG_WITH(ipsec, AC_HELP_STRING([--without-ipsec],[Disable ipsec]), [with_ipsec=0], @@ -37,9 +32,6 @@ AC_ARG_ENABLE(tests, AM_CONDITIONAL(WITH_DPDK, test "$with_dpdk" = "1") AC_SUBST(DPDK,[-DDPDK=${with_dpdk}]) -AM_CONDITIONAL(WITH_VIRL, test "$with_virl" = "1") -AC_SUBST(VIRL,[-DVIRL=${with_virl}]) - AM_CONDITIONAL(WITH_IPSEC, test "$with_ipsec" = "1") AC_SUBST(IPSEC,[-DIPSEC=${with_ipsec}]) diff --git a/vnet/vnet/devices/dpdk/dpdk.h b/vnet/vnet/devices/dpdk/dpdk.h index 5d2a2db7..c44d9cc5 100644 --- a/vnet/vnet/devices/dpdk/dpdk.h +++ b/vnet/vnet/devices/dpdk/dpdk.h @@ -332,7 +332,7 @@ typedef struct { /* * format interface names ala xxxEthernet%d/%d/%d instead of - * xxxEthernet%x/%x/%x. For VIRL. + * xxxEthernet%x/%x/%x. */ u8 interface_name_format_decimal; -- cgit 1.2.3-korg