X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=examples%2Fnetmap_compat%2Fbridge%2Fbridge.c;h=53f5fdb6a3630bae95cc30f196cdd9c4654e1f33;hb=34465a0f7da2d14f35f113c9a31096931cfd257b;hp=0a8efbebc5edab3ea05235890917dd7852497f74;hpb=81f7ecd934372fc9f592d1322f8eff86350fa4f5;p=dpdk.git

diff --git a/examples/netmap_compat/bridge/bridge.c b/examples/netmap_compat/bridge/bridge.c
index 0a8efbebc5..53f5fdb6a3 100644
--- a/examples/netmap_compat/bridge/bridge.c
+++ b/examples/netmap_compat/bridge/bridge.c
@@ -47,9 +47,8 @@
 #include "compat_netmap.h"
 
 
-#define	BUF_SIZE	2048
-#define MBUF_SIZE	(BUF_SIZE + sizeof(struct rte_mbuf) + \
-	RTE_PKTMBUF_HEADROOM)
+#define BUF_SIZE	RTE_MBUF_DEFAULT_DATAROOM
+#define MBUF_DATA_SIZE	(BUF_SIZE + RTE_PKTMBUF_HEADROOM)
 
 #define MBUF_PER_POOL	8192
 
@@ -216,7 +215,7 @@ netmap_port_open(uint32_t idx)
 	err = rte_netmap_ioctl(port->fd, NIOCGINFO, &req);
 	if (err) {
 		printf("[E] NIOCGINFO ioctl failed (error %d)\n", err);
-		return (err);
+		return err;
 	}
 
 	snprintf(req.nr_name, sizeof(req.nr_name), "%s", port->str);
@@ -226,7 +225,7 @@ netmap_port_open(uint32_t idx)
 	err = rte_netmap_ioctl(port->fd, NIOCREGIF, &req);
 	if (err) {
 		printf("[E] NIOCREGIF ioctl failed (error %d)\n", err);
-		return (err);
+		return err;
 	}
 
 	/* mmap only once. */
@@ -236,7 +235,7 @@ netmap_port_open(uint32_t idx)
 
 	if (ports.mem == MAP_FAILED) {
 		printf("[E] NETMAP mmap failed for fd: %d)\n", port->fd);
-		return (-ENOMEM);
+		return -ENOMEM;
 	}
 
 	port->nmif = NETMAP_IF(ports.mem, req.nr_offset);
@@ -244,7 +243,7 @@ netmap_port_open(uint32_t idx)
 	port->tx_ring = NETMAP_TXRING(port->nmif, 0);
 	port->rx_ring = NETMAP_RXRING(port->nmif, 0);
 
-	return (0);
+	return 0;
 }
 
 
@@ -272,11 +271,8 @@ int main(int argc, char *argv[])
 	if (rte_eth_dev_count() < 1)
 		rte_exit(EXIT_FAILURE, "Not enough ethernet ports available\n");
 
-	pool = rte_mempool_create("mbuf_pool", MBUF_PER_POOL, MBUF_SIZE, 32,
-				sizeof(struct rte_pktmbuf_pool_private),
-				rte_pktmbuf_pool_init, NULL,
-				rte_pktmbuf_init, NULL,
-				rte_socket_id(), 0);
+	pool = rte_pktmbuf_pool_create("mbuf_pool", MBUF_PER_POOL, 32, 0,
+		MBUF_DATA_SIZE, rte_socket_id());
 	if (pool == NULL)
 		rte_exit(EXIT_FAILURE, "Couldn't create mempool\n");