7 files changed, 1 insertions, 16 deletions
diff --git a/src/vnet/bier/bier.api b/src/vnet/bier/bier.api
index d07379e92f0..fb6923b4a01 100644
--- a/src/vnet/bier/bier.api
+++ b/src/vnet/bier/bier.api
@@ -96,7 +96,6 @@ define bier_route_dump
 
 define bier_route_details
 {
-  u32 client_index;
   u32 context;
   u16 br_bp;
   vl_api_bier_table_id_t br_tbl_id;
@@ -157,7 +156,6 @@ define bier_imp_dump
 
 define bier_imp_details
 {
-  u32 client_index;
   u32 context;
   vl_api_bier_table_id_t bi_tbl_id;
   u16 bi_src;
diff --git a/src/vnet/ip/ip.api b/src/vnet/ip/ip.api
index 923249b8365..5f664f33cf6 100644
--- a/src/vnet/ip/ip.api
+++ b/src/vnet/ip/ip.api
@@ -287,7 +287,6 @@ autoreply define ip6nd_proxy_add_del
 */
 define ip6nd_proxy_details
 {
-  u32 client_index;
   u32 context;
   u32 sw_if_index;
   u8 address[16];
@@ -510,7 +509,6 @@ manual_endian manual_print define ip6_mfib_details
 
 define ip_address_details
 {
-  u32 client_index;
   u32 context;
   u8 ip[16];
   u8 prefix_length;
@@ -532,7 +530,6 @@ define ip_address_dump
 */
 define ip_unnumbered_details
 {
-  u32 client_index;
   u32 context;
   u32 sw_if_index;
   u32 ip_sw_if_index;
@@ -570,7 +567,6 @@ define mfib_signal_dump
 
 define mfib_signal_details
 {
-  u32 client_index;
   u32 context;
   u32 sw_if_index;
   u32 table_id;
@@ -1014,7 +1010,6 @@ define ip_reassembly_get
 
 define ip_reassembly_get_reply
 {
-  u32 client_index;
   u32 context;
   i32 retval;
   u32 timeout_ms;
diff --git a/src/vnet/lisp-cp/lisp.api b/src/vnet/lisp-cp/lisp.api
index 0e475856944..b1bea092273 100644
--- a/src/vnet/lisp-cp/lisp.api
+++ b/src/vnet/lisp-cp/lisp.api
@@ -626,13 +626,11 @@ define lisp_eid_table_vni_dump
 };
 
 /** \brief reply to lisp_eid_table_vni_dump
-    @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
     @param vni - virtual network instance
  */
 define lisp_eid_table_vni_details
 {
-  u32 client_index;
   u32 context;
   u32 vni;
 };
diff --git a/src/vnet/lisp-cp/one.api b/src/vnet/lisp-cp/one.api
index 32ac70220c5..7f0f5a9fbb1 100644
--- a/src/vnet/lisp-cp/one.api
+++ b/src/vnet/lisp-cp/one.api
@@ -835,13 +835,11 @@ define one_eid_table_vni_dump
 };
 
 /** \brief reply to one_eid_table_vni_dump
-    @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
     @param vni - virtual network instance
  */
 define one_eid_table_vni_details
 {
-  u32 client_index;
   u32 context;
   u32 vni;
 };
diff --git a/src/vnet/lisp-gpe/lisp_gpe.api b/src/vnet/lisp-gpe/lisp_gpe.api
index 140d1bec8d7..fbfc5e315a4 100644
--- a/src/vnet/lisp-gpe/lisp_gpe.api
+++ b/src/vnet/lisp-gpe/lisp_gpe.api
@@ -147,7 +147,6 @@ define gpe_fwd_entry_path_dump
 
 manual_endian manual_print define gpe_fwd_entry_path_details
 {
-  u32 client_index;
   u32 context;
   vl_api_gpe_locator_t lcl_loc;
   vl_api_gpe_locator_t rmt_loc;
diff --git a/src/vnet/session/session.api b/src/vnet/session/session.api
index 58054ae4ba2..c60e99ea14a 100644
--- a/src/vnet/session/session.api
+++ b/src/vnet/session/session.api
@@ -258,14 +258,11 @@ define reset_session {
 };
 
 /** \brief client->vpp reset session reply
-    @param client_index - opaque cookie to identify the sender
-                          client to vpp direction only
     @param context - sender context, to match reply w/ request
     @param retval - return code for the request
     @param handle - session handle obtained via accept/connect
 */
 define reset_session_reply {
-  u32 client_index;
   u32 context;
   i32 retval;
   u64 handle;
diff --git a/src/vnet/session/session_api.c b/src/vnet/session/session_api.c
index d1cbc646e52..dddc1f5f03f 100755
--- a/src/vnet/session/session_api.c
+++ b/src/vnet/session/session_api.c
@@ -955,7 +955,7 @@ vl_api_reset_session_reply_t_handler (vl_api_reset_session_reply_t * mp)
   stream_session_t *s;
   u32 index, thread_index;
 
-  app = application_lookup (mp->client_index);
+  app = application_lookup (mp->context);
   if (!app)
     return;