X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fsession%2Fsession_api.c;fp=src%2Fvnet%2Fsession%2Fsession_api.c;h=0574a58c723b5188e2f1d71111bf7a203490d83b;hb=94a52d795d4cdf3ed326409247f4f30c0a6e4f2b;hp=06edb82bdb347dd52466fa945db4804685c5d04d;hpb=2c5e2184efd95d7c011ab9a4c6d8fd588e051ed7;p=vpp.git

diff --git a/src/vnet/session/session_api.c b/src/vnet/session/session_api.c
index 06edb82bdb3..0574a58c723 100644
--- a/src/vnet/session/session_api.c
+++ b/src/vnet/session/session_api.c
@@ -709,9 +709,9 @@ done:
     ((!rv && mp->is_add) ? vec_len (args.segment->name) : 0), ({
       rmp->is_add = mp->is_add;
       rmp->wrk_index = clib_host_to_net_u32 (args.wrk_map_index);
-      rmp->segment_handle = clib_host_to_net_u64 (args.segment_handle);
       if (!rv && mp->is_add)
 	{
+	  rmp->segment_handle = clib_host_to_net_u64 (args.segment_handle);
 	  rmp->app_event_queue_address =
 	    fifo_segment_msg_q_offset ((fifo_segment_t *) args.segment, 0);
 	  rmp->n_fds = n_fds;
@@ -1473,9 +1473,9 @@ done:
   rmp->is_add = mp->is_add;
   rmp->api_client_handle = sapi_handle;
   rmp->wrk_index = args.wrk_map_index;
-  rmp->segment_handle = args.segment_handle;
   if (!rv && mp->is_add)
     {
+      rmp->segment_handle = args.segment_handle;
       /* No segment name and size. This supports only memfds */
       rmp->app_event_queue_address =
 	fifo_segment_msg_q_offset ((fifo_segment_t *) args.segment, 0);