X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=examples%2Fkni%2Fmain.c;h=a5297f281c3089b5e9772ce7326a1abd7d0f4ee9;hb=dc10406f3e7c82d1dad2884ffae8745f2a11ab70;hp=47cc873fef0971b52a72b912ba0431532ac0e42c;hpb=b4bb86cc6aec332aaaa96c2e17ded51ee901f6ef;p=dpdk.git

diff --git a/examples/kni/main.c b/examples/kni/main.c
index 47cc873fef..a5297f281c 100644
--- a/examples/kni/main.c
+++ b/examples/kni/main.c
@@ -54,7 +54,6 @@
 #include <rte_memory.h>
 #include <rte_memcpy.h>
 #include <rte_memzone.h>
-#include <rte_tailq.h>
 #include <rte_eal.h>
 #include <rte_per_lcore.h>
 #include <rte_launch.h>
@@ -81,9 +80,8 @@
 /* Max size of a single packet */
 #define MAX_PACKET_SZ           2048
 
-/* Number of bytes needed for each mbuf */
-#define MBUF_SZ \
-	(MAX_PACKET_SZ + sizeof(struct rte_mbuf) + RTE_PKTMBUF_HEADROOM)
+/* Size of the data buffer in each mbuf */
+#define MBUF_DATA_SZ (MAX_PACKET_SZ + RTE_PKTMBUF_HEADROOM)
 
 /* Number of mbufs in mempool that is created */
 #define NB_MBUF                 (8192 * 16)
@@ -462,8 +460,8 @@ parse_config(const char *arg)
 			goto fail;
 		}
 		kni_port_params_array[port_id] =
-			(struct kni_port_params*)rte_zmalloc("KNI_port_params",
-			sizeof(struct kni_port_params), CACHE_LINE_SIZE);
+			rte_zmalloc("KNI_port_params",
+				    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++];
@@ -672,7 +670,7 @@ check_all_ports_link_status(uint8_t port_num, uint32_t port_mask)
 				continue;
 			}
 			/* clear all_ports_up flag if any link down */
-			if (link.link_status == 0) {
+			if (link.link_status == ETH_LINK_DOWN) {
 				all_ports_up = 0;
 				break;
 			}
@@ -832,9 +830,9 @@ kni_free_kni(uint8_t port_id)
 	if (port_id >= RTE_MAX_ETHPORTS || !p[port_id])
 		return -1;
 
-	for (i = 0; i < p[i]->nb_kni; i++) {
-		rte_kni_release(p[i]->kni[i]);
-		p[i]->kni[i] = NULL;
+	for (i = 0; i < p[port_id]->nb_kni; i++) {
+		rte_kni_release(p[port_id]->kni[i]);
+		p[port_id]->kni[i] = NULL;
 	}
 	rte_eth_dev_stop(port_id);
 
@@ -868,11 +866,8 @@ main(int argc, char** argv)
 		rte_exit(EXIT_FAILURE, "Could not parse input parameters\n");
 
 	/* Create the mbuf pool */
-	pktmbuf_pool = rte_mempool_create("mbuf_pool", NB_MBUF, MBUF_SZ,
-			MEMPOOL_CACHE_SZ,
-			sizeof(struct rte_pktmbuf_pool_private),
-			rte_pktmbuf_pool_init, NULL, rte_pktmbuf_init, NULL,
-			rte_socket_id(), 0);
+	pktmbuf_pool = rte_pktmbuf_pool_create("mbuf_pool", NB_MBUF,
+		MEMPOOL_CACHE_SZ, 0, MBUF_DATA_SZ, rte_socket_id());
 	if (pktmbuf_pool == NULL) {
 		rte_exit(EXIT_FAILURE, "Could not initialise mbuf pool\n");
 		return -1;
@@ -931,4 +926,3 @@ main(int argc, char** argv)
 
 	return 0;
 }
-