X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Fmarvell%2Fpp2%2Fpp2.c;h=016ad53cc969baa86ee52b414f1e2503208b0308;hb=8d3397425b3fe0f58b621854eb95d225fcbb415f;hp=47c853df2bff6b43c2bba854ca4b0f688083cba0;hpb=e356cbfaa8cc83e355da16aaa5a82f1f138e1572;p=vpp.git

diff --git a/src/plugins/marvell/pp2/pp2.c b/src/plugins/marvell/pp2/pp2.c
index 47c853df2bf..016ad53cc96 100644
--- a/src/plugins/marvell/pp2/pp2.c
+++ b/src/plugins/marvell/pp2/pp2.c
@@ -157,9 +157,12 @@ mrvl_pp2_delete_if (mrvl_pp2_if_t * ppif)
 	while (n_bufs--)
 	  {
 	    struct pp2_buff_inf binf;
-	    if (pp2_bpool_get_buff
-		(ppm->per_thread_data[0].hif, inq->bpool, &binf) == 0)
-	      vlib_buffer_free (vm, &binf.cookie, 1);
+	    if (pp2_bpool_get_buff (ppm->per_thread_data[0].hif, inq->bpool,
+				    &binf) == 0)
+	      {
+	         u32 bi = binf.cookie;
+	         vlib_buffer_free (vm, &bi, 1);
+	      }
 	  }
 	pp2_bpool_deinit (inq->bpool);
       }
@@ -200,8 +203,8 @@ mrvl_pp2_create_if (mrvl_pp2_create_if_args_t * args)
   n_outqs = tm->n_vlib_mains;
 
   /* defaults */
-  args->tx_q_sz = args->tx_q_sz ? args->tx_q_sz : 2048;
-  args->rx_q_sz = args->rx_q_sz ? args->rx_q_sz : 2048;
+  args->tx_q_sz = args->tx_q_sz ? args->tx_q_sz : 2 * VLIB_FRAME_SIZE;
+  args->rx_q_sz = args->rx_q_sz ? args->rx_q_sz : 2 * VLIB_FRAME_SIZE;
 
   if (vec_len (ppm->per_thread_data) == 0)
     {
@@ -212,8 +215,7 @@ mrvl_pp2_create_if (mrvl_pp2_create_if_args_t * args)
 	}
     }
 
-  pool_get (ppm->interfaces, ppif);
-  memset (ppif, 0, sizeof (*ppif));
+  pool_get_zero (ppm->interfaces, ppif);
   ppif->dev_instance = ppif - ppm->interfaces;
   ppif->hw_if_index = ~0;
   vec_validate_aligned (ppif->inqs, n_inqs - 1, CLIB_CACHE_LINE_BYTES);
@@ -260,7 +262,7 @@ mrvl_pp2_create_if (mrvl_pp2_create_if_args_t * args)
   ppio_params.inqs_params.tcs_params[0].pkt_offset = 0;
   ppio_params.inqs_params.tcs_params[0].num_in_qs = n_inqs;
   ppio_params.inqs_params.tcs_params[0].inqs_params = &inq_params;
-  ppio_params.inqs_params.tcs_params[0].pools[0] = ppif->inqs[0].bpool;
+  ppio_params.inqs_params.tcs_params[0].pools[0][0] = ppif->inqs[0].bpool;
   ppio_params.outqs_params.num_outqs = n_outqs;
   for (i = 0; i < n_outqs; i++)
     {