X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=examples%2Fip_pipeline%2Finit.c;h=e0c0464f0e726d8842b10f964f653704fb65991b;hb=fdf20fa7bee9df9037116318a87080e1eb7e757e;hp=d00027fef92b9eb4c1cf4f7e5dfd3e3ad246fe20;hpb=6f41fe75e2dd8dd38f7bea7b9501edd4f9b72fa5;p=dpdk.git diff --git a/examples/ip_pipeline/init.c b/examples/ip_pipeline/init.c index d00027fef9..e0c0464f0e 100644 --- a/examples/ip_pipeline/init.c +++ b/examples/ip_pipeline/init.c @@ -419,7 +419,7 @@ app_init_rings(void) RTE_LOG(INFO, USER1, "Initializing %u SW rings ...\n", n_swq); app.rings = rte_malloc_socket(NULL, n_swq * sizeof(struct rte_ring *), - CACHE_LINE_SIZE, rte_socket_id()); + RTE_CACHE_LINE_SIZE, rte_socket_id()); if (app.rings == NULL) rte_panic("Cannot allocate memory to store ring pointers\n"); @@ -474,11 +474,6 @@ app_init_ports(void) { uint32_t i; - /* Init driver */ - RTE_LOG(INFO, USER1, "Initializing the PMD driver ...\n"); - if (rte_eal_pci_probe() < 0) - rte_panic("Cannot probe PCI\n"); - /* Init NIC ports, then start the ports */ for (i = 0; i < app.n_ports; i++) { uint32_t port; @@ -561,7 +556,7 @@ app_ping(void) rte_panic("Unable to allocate new message\n"); req = (struct app_msg_req *) - ((struct rte_mbuf *)msg)->ctrl.data; + rte_ctrlmbuf_data((struct rte_mbuf *)msg); req->type = APP_MSG_REQ_PING; /* Send request */ @@ -600,7 +595,7 @@ app_init_etc(void) void app_init(void) { - if ((sizeof(struct app_pkt_metadata) % CACHE_LINE_SIZE) != 0) + if ((sizeof(struct app_pkt_metadata) % RTE_CACHE_LINE_SIZE) != 0) rte_panic("Application pkt meta-data size mismatch\n"); app_check_core_params();