dpdk: remove KNI support

[vpp.git] / vnet / vnet / devices / dpdk / init.c

diff --git a/vnet/vnet/devices/dpdk/init.c b/vnet/vnet/devices/dpdk/init.c
index 73edc4a..64623c1 100644 (file)
--- a/vnet/vnet/devices/dpdk/init.c
+++ b/vnet/vnet/devices/dpdk/init.c
@@ -810,80 +810,6 @@ dpdk_lib_init (dpdk_main_t * dm)
       rte_eth_dev_set_mtu (xd->device_index, hi->max_packet_bytes);
     }
 
-#ifdef RTE_LIBRTE_KNI
-  if (dm->conf->num_kni)
-    {
-      clib_warning ("Initializing KNI interfaces...");
-      rte_kni_init (dm->conf->num_kni);
-      for (i = 0; i < dm->conf->num_kni; i++)
-       {
-         u8 addr[6];
-         int j;
-
-         /* Create vnet interface */
-         vec_add2_aligned (dm->devices, xd, 1, CLIB_CACHE_LINE_BYTES);
-         xd->flags |= DPDK_DEVICE_FLAG_KNI;
-
-         xd->device_index = xd - dm->devices;
-         ASSERT (nports + i == xd->device_index);
-         xd->per_interface_next_index = ~0;
-         xd->kni_port_id = i;
-         xd->cpu_socket = -1;
-         hash_set (dm->dpdk_device_by_kni_port_id, i, xd - dm->devices);
-         xd->rx_q_used = 1;
-
-         /* assign interface to input thread */
-         dpdk_device_and_queue_t *dq;
-         vec_add2 (dm->devices_by_cpu[dm->input_cpu_first_index], dq, 1);
-         dq->device = xd->device_index;
-         dq->queue_id = 0;
-
-         vec_validate_aligned (xd->tx_vectors, tm->n_vlib_mains,
-                               CLIB_CACHE_LINE_BYTES);
-         for (j = 0; j < tm->n_vlib_mains; j++)
-           {
-             vec_validate_ha (xd->tx_vectors[j], xd->nb_tx_desc,
-                              sizeof (tx_ring_hdr_t), CLIB_CACHE_LINE_BYTES);
-             vec_reset_length (xd->tx_vectors[j]);
-           }
-
-         vec_validate_aligned (xd->rx_vectors, xd->rx_q_used,
-                               CLIB_CACHE_LINE_BYTES);
-         for (j = 0; j < xd->rx_q_used; j++)
-           {
-             vec_validate_aligned (xd->rx_vectors[j], VLIB_FRAME_SIZE - 1,
-                                   CLIB_CACHE_LINE_BYTES);
-             vec_reset_length (xd->rx_vectors[j]);
-           }
-
-         /* FIXME Set up one TX-queue per worker thread */
-
-         {
-           f64 now = vlib_time_now (vm);
-           u32 rnd;
-           rnd = (u32) (now * 1e6);
-           rnd = random_u32 (&rnd);
-
-           clib_memcpy (addr + 2, &rnd, sizeof (rnd));
-           addr[0] = 2;
-           addr[1] = 0xfe;
-         }
-
-         error = ethernet_register_interface
-           (dm->vnet_main, dpdk_device_class.index, xd->device_index,
-            /* ethernet address */ addr,
-            &xd->vlib_hw_if_index, dpdk_flag_change);
-
-         if (error)
-           return error;
-
-         sw = vnet_get_hw_sw_interface (dm->vnet_main, xd->vlib_hw_if_index);
-         xd->vlib_sw_if_index = sw->sw_if_index;
-         hi = vnet_get_hw_interface (dm->vnet_main, xd->vlib_hw_if_index);
-       }
-    }
-#endif
-
   if (nb_desc > dm->conf->num_mbufs)
     clib_warning ("%d mbufs allocated but total rx/tx ring size is %d\n",
                  dm->conf->num_mbufs, nb_desc);