From 399ca1ca5267861b56a81f64e689aa42b9a79620 Mon Sep 17 00:00:00 2001 From: Ole Troan Date: Tue, 6 Dec 2016 23:00:38 +0100 Subject: SPAN API: Fix various errors making SPAN break make tests. - s/l2/span in span_api.c in foreach macro - Not installing .json from Makefile.am Change-Id: I2469fe01138d62e044b8262cdb5a6e3b009bb43e Signed-off-by: Ole Troan --- vnet/Makefile.am | 3 ++- vnet/vnet/span/span.api | 4 ++-- vnet/vnet/span/span_api.c | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) (limited to 'vnet') diff --git a/vnet/Makefile.am b/vnet/Makefile.am index 6e891f9de0e..930d6bb9278 100644 --- a/vnet/Makefile.am +++ b/vnet/Makefile.am @@ -917,7 +917,8 @@ api_DATA = \ vnet/interface.api.json \ vnet/ip/ip.api.json \ vnet/l2/l2.api.json \ - vnet/map/map.api.json + vnet/map/map.api.json \ + vnet/span/span.api.json # The actual %.api.h rule is in .../build-data/packages/suffix-rules.mk # and requires a symbolic link at the top of the vnet source tree diff --git a/vnet/vnet/span/span.api b/vnet/vnet/span/span.api index 2f3b4118186..4babdd834ee 100644 --- a/vnet/vnet/span/span.api +++ b/vnet/vnet/span/span.api @@ -21,7 +21,7 @@ @param sw_if_index_to - interface where the traffic is mirrored @param state - 0 = disabled, 1 = rx enabled, 2 = tx enabled, 3 tx & rx enabled */ -define sw_interface_span_enable_disable{ +define sw_interface_span_enable_disable { u32 client_index; u32 context; u32 sw_if_index_from; @@ -57,4 +57,4 @@ define sw_interface_span_details { u32 sw_if_index_from; u32 sw_if_index_to; u8 state; -}; \ No newline at end of file +}; diff --git a/vnet/vnet/span/span_api.c b/vnet/vnet/span/span_api.c index eacd6ec8531..b4565663eb9 100644 --- a/vnet/vnet/span/span_api.c +++ b/vnet/vnet/span/span_api.c @@ -115,7 +115,7 @@ static void setup_message_id_table (api_main_t * am) { #define _(id,n,crc) vl_msg_api_add_msg_name_crc (am, #n "_" #crc, id); - foreach_vl_msg_name_crc_l2; + foreach_vl_msg_name_crc_span; #undef _ } -- cgit 1.2.3-korg