From 6f7b992f56955b9eee2f9bd6357e2119645e80f7 Mon Sep 17 00:00:00 2001 From: Dave Barach Date: Fri, 20 May 2016 14:43:57 -0400 Subject: VPP-80: netmap binary API message element name collision if_name collides w/ ietf-interfaces.yang member name, causing a build-break in an existing yang-model-based app. Rename to "netmap_if_name". Change-Id: Id386eacd77343dd15a868c28dacd2b0e4523bc9b Signed-off-by: Dave Barach --- vpp-api-test/vat/api_format.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'vpp-api-test') diff --git a/vpp-api-test/vat/api_format.c b/vpp-api-test/vat/api_format.c index 0b4ef559..27d3f9a1 100644 --- a/vpp-api-test/vat/api_format.c +++ b/vpp-api-test/vat/api_format.c @@ -10534,7 +10534,7 @@ api_netmap_create (vat_main_t * vam) M(NETMAP_CREATE, netmap_create); - clib_memcpy (mp->if_name, if_name, vec_len (if_name)); + clib_memcpy (mp->netmap_if_name, if_name, vec_len (if_name)); clib_memcpy (mp->hw_addr, hw_addr, 6); mp->use_random_hw_addr = random_hw_addr; mp->is_pipe = is_pipe; @@ -10573,7 +10573,7 @@ api_netmap_delete (vat_main_t * vam) M(NETMAP_DELETE, netmap_delete); - clib_memcpy (mp->if_name, if_name, vec_len (if_name)); + clib_memcpy (mp->netmap_if_name, if_name, vec_len (if_name)); vec_free (if_name); S; W; -- cgit 1.2.3-korg