summaryrefslogtreecommitdiffstats
path: root/vpp-api-test
diff options
context:
space:
mode:
authorDave Barach <dave@barachs.net>2016-05-20 14:43:57 -0400
committerDave Barach <dave@barachs.net>2016-05-20 14:44:10 -0400
commit6f7b992f56955b9eee2f9bd6357e2119645e80f7 (patch)
tree87fe6ac233a9c550b6733a90353a5449b6781be6 /vpp-api-test
parentb635c567d16cb942e9380bedd6cd9e59428da4eb (diff)
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 <dave@barachs.net>
Diffstat (limited to 'vpp-api-test')
-rw-r--r--vpp-api-test/vat/api_format.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/vpp-api-test/vat/api_format.c b/vpp-api-test/vat/api_format.c
index 0b4ef5590e5..27d3f9a18c8 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;