net/sfc: fix jumbo frame flag condition for MTU set

[dpdk.git] / examples / l2fwd-crypto / main.c

diff --git a/examples/l2fwd-crypto/main.c b/examples/l2fwd-crypto/main.c
index 820470d..a96cb94 100644 (file)
--- a/examples/l2fwd-crypto/main.c
+++ b/examples/l2fwd-crypto/main.c
@@ -43,7 +43,7 @@
 #include <rte_prefetch.h>
 #include <rte_random.h>
 #include <rte_hexdump.h>
-#ifdef RTE_LIBRTE_PMD_CRYPTO_SCHEDULER
+#ifdef RTE_CRYPTO_SCHEDULER
 #include <rte_cryptodev_scheduler.h>
 #endif
 
@@ -874,8 +874,8 @@ l2fwd_main_loop(struct l2fwd_crypto_options *options)
                                if (unlikely(timer_tsc >=
                                                (uint64_t)timer_period)) {
 
-                                       /* do this only on master core */
-                                       if (lcore_id == rte_get_master_lcore()
+                                       /* do this only on main core */
+                                       if (lcore_id == rte_get_main_lcore()
                                                && options->refresh_period) {
                                                print_stats();
                                                timer_tsc = 0;
@@ -2273,12 +2273,12 @@ initialize_cryptodevs(struct l2fwd_crypto_options *options, unsigned nb_ports,
                 * (one for the header, one for the private data)
                 */
                if (!strcmp(dev_info.driver_name, "crypto_scheduler")) {
-#ifdef RTE_LIBRTE_PMD_CRYPTO_SCHEDULER
-                       uint32_t nb_slaves =
-                               rte_cryptodev_scheduler_slaves_get(cdev_id,
+#ifdef RTE_CRYPTO_SCHEDULER
+                       uint32_t nb_workers =
+                               rte_cryptodev_scheduler_workers_get(cdev_id,
                                                                NULL);
 
-                       sessions_needed = enabled_cdev_count * nb_slaves;
+                       sessions_needed = enabled_cdev_count * nb_workers;
 #endif
                } else
                        sessions_needed = enabled_cdev_count;
@@ -2799,8 +2799,8 @@ main(int argc, char **argv)
 
        /* launch per-lcore init on every lcore */
        rte_eal_mp_remote_launch(l2fwd_launch_one_lcore, (void *)&options,
-                       CALL_MASTER);
-       RTE_LCORE_FOREACH_SLAVE(lcore_id) {
+                       CALL_MAIN);
+       RTE_LCORE_FOREACH_WORKER(lcore_id) {
                if (rte_eal_wait_lcore(lcore_id) < 0)
                        return -1;
        }