From ee8b973de9d6cfd01f7f5ac6c9058c23f6220ab6 Mon Sep 17 00:00:00 2001 From: Neale Ranns Date: Wed, 11 Apr 2018 08:08:30 -0700 Subject: VOM: support for pipes Change-Id: I5c381dfe2f926f94a34ee8ed8f1b9ec6038d5fe2 Signed-off-by: Neale Ranns (cherry picked from commit 208c29aac523231af2420a95ba7e5d361698780b) --- src/vnet/devices/pipe/pipe.api | 14 +++++++------- src/vnet/devices/pipe/pipe_api.c | 6 +++--- 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'src') diff --git a/src/vnet/devices/pipe/pipe.api b/src/vnet/devices/pipe/pipe.api index d3dfd16bcd4..55b93fdbd33 100644 --- a/src/vnet/devices/pipe/pipe.api +++ b/src/vnet/devices/pipe/pipe.api @@ -38,28 +38,28 @@ define pipe_create /** \brief Reply for pipe create reply @param context - returned sender context, to match reply w/ request @param retval - return code - @param parent_sw_if_index - software index allocated for the new pipe parent interface - Use the parent interface for link up/down and to delete + @param sw_if_index - software index allocated for the new pipe parent interface + Use the parent interface for link up/down and to delete @param pipe_sw_if_index - the two SW indicies that form the ends of the pipe. */ define pipe_create_reply { u32 context; i32 retval; - u32 parent_sw_if_index; + u32 sw_if_index; u32 pipe_sw_if_index[2]; }; /** \brief Delete pipe interface @param client_index - opaque cookie to identify the sender @param context - sender context, to match reply w/ request - @param parnet_sw_if_index - interface index of existing pipe interface + @param sw_if_index - interface index of existing pipe interface */ autoreply define pipe_delete { u32 client_index; u32 context; - u32 parent_sw_if_index; + u32 sw_if_index; }; /** \brief Dump pipe interfaces request */ @@ -71,14 +71,14 @@ define pipe_dump /** \brief Reply for pipe dump request @param sw_if_index - software index of pipe interface - @param parent_sw_if_index - software index allocated for the pipe parent interface + @param sw_if_index - software index allocated for the pipe parent interface @param pipe_sw_if_index - the two SW indicies that form the ends of the pipe. @param instance - instance allocated */ define pipe_details { u32 context; - u32 parent_sw_if_index; + u32 sw_if_index; u32 pipe_sw_if_index[2]; u32 instance; }; diff --git a/src/vnet/devices/pipe/pipe_api.c b/src/vnet/devices/pipe/pipe_api.c index 46bbea5f275..cb67d1f0404 100644 --- a/src/vnet/devices/pipe/pipe_api.c +++ b/src/vnet/devices/pipe/pipe_api.c @@ -59,7 +59,7 @@ vl_api_pipe_create_t_handler (vl_api_pipe_create_t * mp) /* *INDENT-OFF* */ REPLY_MACRO2(VL_API_PIPE_CREATE_REPLY, ({ - rmp->parent_sw_if_index = ntohl (parent_sw_if_index); + rmp->sw_if_index = ntohl (parent_sw_if_index); rmp->pipe_sw_if_index[0] = ntohl (pipe_sw_if_index[0]); rmp->pipe_sw_if_index[1] = ntohl (pipe_sw_if_index[1]); })); @@ -72,7 +72,7 @@ vl_api_pipe_delete_t_handler (vl_api_pipe_delete_t * mp) vl_api_pipe_delete_reply_t *rmp; int rv; - rv = vnet_delete_pipe_interface (ntohl (mp->parent_sw_if_index)); + rv = vnet_delete_pipe_interface (ntohl (mp->sw_if_index)); REPLY_MACRO (VL_API_PIPE_DELETE_REPLY); } @@ -98,7 +98,7 @@ pipe_send_details (u32 parent_sw_if_index, mp->context = ctx->context; mp->instance = ntohl (instance); - mp->parent_sw_if_index = ntohl (parent_sw_if_index); + mp->sw_if_index = ntohl (parent_sw_if_index); mp->pipe_sw_if_index[0] = ntohl (pipe_sw_if_index[0]); mp->pipe_sw_if_index[1] = ntohl (pipe_sw_if_index[1]); -- cgit 1.2.3-korg