add prefix to cache line macros

[dpdk.git] / examples / kni / main.c

diff --git a/examples/kni/main.c b/examples/kni/main.c
index cb17b43..45b96bc 100644 (file)
--- a/examples/kni/main.c
+++ b/examples/kni/main.c
@@ -463,7 +463,7 @@ parse_config(const char *arg)
                }
                kni_port_params_array[port_id] =
                        (struct kni_port_params*)rte_zmalloc("KNI_port_params",
-                       sizeof(struct kni_port_params), CACHE_LINE_SIZE);
+                       sizeof(struct kni_port_params), RTE_CACHE_LINE_SIZE);
                kni_port_params_array[port_id]->port_id = port_id;
                kni_port_params_array[port_id]->lcore_rx =
                                        (uint8_t)int_fld[i++];
@@ -586,6 +586,25 @@ parse_args(int argc, char **argv)
        return ret;
 }
 
+/* Initialize KNI subsystem */
+static void
+init_kni(void)
+{
+       unsigned int num_of_kni_ports = 0, i;
+       struct kni_port_params **params = kni_port_params_array;
+
+       /* Calculate the maximum number of KNI interfaces that will be used */
+       for (i = 0; i < RTE_MAX_ETHPORTS; i++) {
+               if (kni_port_params_array[i]) {
+                       num_of_kni_ports += (params[i]->nb_lcore_k ?
+                               params[i]->nb_lcore_k : 1);
+               }
+       }
+
+       /* Invoke rte KNI init to preallocate the ports */
+       rte_kni_init(num_of_kni_ports);
+}
+
 /* Initialise a single port on an Ethernet device */
 static void
 init_port(uint8_t port)
@@ -862,9 +881,7 @@ main(int argc, char** argv)
        /* Get number of ports found in scan */
        nb_sys_ports = rte_eth_dev_count();
        if (nb_sys_ports == 0)
-               rte_exit(EXIT_FAILURE, "No supported Ethernet devices found - "
-                       "check that CONFIG_RTE_LIBRTE_IGB_PMD=y and/or "
-                       "CONFIG_RTE_LIBRTE_IXGBE_PMD=y in the config file\n");
+               rte_exit(EXIT_FAILURE, "No supported Ethernet device found\n");
 
        /* Check if the configured port ID is valid */
        for (i = 0; i < RTE_MAX_ETHPORTS; i++)
@@ -872,6 +889,9 @@ main(int argc, char** argv)
                        rte_exit(EXIT_FAILURE, "Configured invalid "
                                                "port ID %u\n", i);
 
+       /* Initialize KNI subsystem */
+       init_kni();
+
        /* Initialise each port */
        for (port = 0; port < nb_sys_ports; port++) {
                /* Skip ports that are not enabled */