X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fpg%2Finput.c;h=82c6c81cf18cdccb74fc33cb72cceae6118d7cfb;hb=d2dcd200fe2e94f6408155f6c38e7f570dbe1183;hp=f31152c3889abe1fce770591dfa59a454f1c59ad;hpb=bd846cdc5d99260274a02e9bb474211ef32d031c;p=vpp.git

diff --git a/src/vnet/pg/input.c b/src/vnet/pg/input.c
index f31152c3889..82c6c81cf18 100644
--- a/src/vnet/pg/input.c
+++ b/src/vnet/pg/input.c
@@ -1083,6 +1083,7 @@ init_replay_buffers_inline (vlib_main_t * vm,
       vnet_buffer (b0)->sw_if_index[VLIB_TX] = (u32) ~ 0;
 
       d0 = vec_elt (s->replay_packet_templates, i);
+      vnet_buffer2 (b0)->pg_replay_timestamp = s->replay_packet_timestamps[i];
 
       n0 = n_data;
       if (data_offset + n_data >= vec_len (d0))
@@ -1178,25 +1179,6 @@ init_buffers_inline (vlib_main_t * vm,
     }
 }
 
-static void
-pg_buffer_init (vlib_main_t * vm,
-		vlib_buffer_free_list_t * fl, u32 * buffers, u32 n_buffers)
-{
-  pg_main_t *pg = &pg_main;
-  pg_stream_t *s;
-  uword bi, si;
-
-  si = fl->buffer_init_function_opaque & pow2_mask (24);
-  bi = fl->buffer_init_function_opaque >> 24;
-
-  s = pool_elt_at_index (pg->streams, si);
-
-  init_buffers_inline (vm, s, buffers, n_buffers,
-		       /* data_offset */ bi * s->buffer_bytes,
-		       /* n_data */ s->buffer_bytes,
-		       /* set_data */ 1);
-}
-
 static u32
 pg_stream_fill_helper (pg_main_t * pg,
 		       pg_stream_t * s,
@@ -1204,26 +1186,9 @@ pg_stream_fill_helper (pg_main_t * pg,
 		       u32 * buffers, u32 * next_buffers, u32 n_alloc)
 {
   vlib_main_t *vm = vlib_get_main ();
-  vlib_buffer_free_list_t *f;
   uword is_start_of_packet = bi == s->buffer_indices;
   u32 n_allocated;
 
-  f = vlib_buffer_get_free_list (vm, bi->free_list_index);
-
-  /*
-   * Historically, the pg maintained its own free lists and
-   * device drivers tx paths would return pkts.
-   */
-  if (vm->buffer_main->callbacks_registered == 0 &&
-      !(s->flags & PG_STREAM_FLAGS_DISABLE_BUFFER_RECYCLE))
-    f->buffer_init_function = pg_buffer_init;
-  f->buffer_init_function_opaque =
-    (s - pg->streams) | ((bi - s->buffer_indices) << 24);
-
-  if (is_start_of_packet)
-    vnet_buffer (&f->buffer_init_template)->sw_if_index[VLIB_RX]
-      = vnet_main.local_interface_sw_if_index;
-
   n_allocated = vlib_buffer_alloc_from_free_list (vm,
 						  buffers,
 						  n_alloc,
@@ -1238,16 +1203,12 @@ pg_stream_fill_helper (pg_main_t * pg,
   n_alloc = n_allocated;
 
   /* Reinitialize buffers */
-  if (vm->buffer_main->callbacks_registered == 0 || CLIB_DEBUG > 0
-      || (s->flags & PG_STREAM_FLAGS_DISABLE_BUFFER_RECYCLE))
-    init_buffers_inline
-      (vm, s,
-       buffers,
-       n_alloc, (bi - s->buffer_indices) * s->buffer_bytes /* data offset */ ,
-       s->buffer_bytes,
-       /* set_data */
-       vm->buffer_main->callbacks_registered != 0
-       || (s->flags & PG_STREAM_FLAGS_DISABLE_BUFFER_RECYCLE) != 0);
+  init_buffers_inline
+    (vm, s,
+     buffers,
+     n_alloc, (bi - s->buffer_indices) * s->buffer_bytes /* data offset */ ,
+     s->buffer_bytes,
+     /* set_data */ 1);
 
   if (next_buffers)
     pg_set_next_buffer_pointers (pg, s, buffers, next_buffers, n_alloc);
@@ -1559,11 +1520,8 @@ pg_generate_packets (vlib_node_runtime_t * node,
 	  {
 	    vlib_buffer_t *b;
 	    b = vlib_get_buffer (vm, to_next[i]);
-	    vnet_buffer (b)->device_input_feat.saved_next_index =
-	      s->next_index;
-	    vnet_buffer (b)->device_input_feat.buffer_advance = 0;
 	    b->current_config_index = current_config_index;
-	    b->feature_arc_index = feature_arc_index;
+	    vnet_buffer (b)->feature_arc_index = feature_arc_index;
 	  }
 
       n_trace = vlib_get_trace_count (vm, node);