X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=examples%2Fnetmap_compat%2Fbridge%2Fbridge.c;h=2d935cb5bd58f23f3bafd430f3422bf8d6ca67e4;hb=ea0c20ea95fd5d71a10757e6598ac66233ea1495;hp=e0cef5796c3626536789c547a9b1dcbaa334978a;hpb=e5ffdd1457c0fb4e8365f524ee2529ac726edcf3;p=dpdk.git

diff --git a/examples/netmap_compat/bridge/bridge.c b/examples/netmap_compat/bridge/bridge.c
index e0cef5796c..2d935cb5bd 100644
--- a/examples/netmap_compat/bridge/bridge.c
+++ b/examples/netmap_compat/bridge/bridge.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
- * 
+ *
  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   All rights reserved.
- * 
+ *
  *   Redistribution and use in source and binary forms, with or without
  *   modification, are permitted provided that the following conditions
  *   are met:
- * 
+ *
  *     * Redistributions of source code must retain the above copyright
  *       notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above copyright
@@ -17,7 +17,7 @@
  *     * Neither the name of Intel Corporation nor the names of its
  *       contributors may be used to endorse or promote products derived
  *       from this software without specific prior written permission.
- * 
+ *
  *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -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	(2048)
+#define MBUF_DATA_SIZE	(BUF_SIZE + RTE_PKTMBUF_HEADROOM)
 
 #define MBUF_PER_POOL	8192
 
@@ -67,29 +66,6 @@ struct rte_eth_conf eth_conf = {
 	},
 };
 
-struct rte_eth_txconf tx_conf = {
-	.tx_thresh = {
-	    .pthresh = 36,
-	    .hthresh = 0,
-	    .wthresh = 0,
-	},
-	.tx_free_thresh = 0,
-	.tx_rs_thresh = 0,
-	.txq_flags = (ETH_TXQ_FLAGS_NOMULTSEGS |
-			ETH_TXQ_FLAGS_NOVLANOFFL |
-			ETH_TXQ_FLAGS_NOXSUMSCTP |
-			ETH_TXQ_FLAGS_NOXSUMUDP |
-			ETH_TXQ_FLAGS_NOXSUMTCP)
-};
-
-struct rte_eth_rxconf rx_conf = {
-	.rx_thresh = {
-	    .pthresh = 8,
-	    .hthresh = 8,
-	    .wthresh = 4,
-	},
-};
-
 #define	MAX_QUEUE_NUM	1
 #define	RX_QUEUE_NUM	1
 #define	TX_QUEUE_NUM	1
@@ -103,8 +79,6 @@ struct rte_eth_rxconf rx_conf = {
 
 struct rte_netmap_port_conf port_conf = {
 	.eth_conf = &eth_conf,
-	.tx_conf  = &tx_conf,
-	.rx_conf  = &rx_conf,
 	.socket_id = SOCKET_ID_ANY,
 	.nr_tx_rings = TX_QUEUE_NUM,
 	.nr_rx_rings = RX_QUEUE_NUM,
@@ -181,7 +155,7 @@ parse_args(int argc, char **argv)
 				rte_exit(EXIT_FAILURE, "configs with %u "
 					"ports are not supported\n",
 					ports.num + 1);
-					
+
 			}
 
 			ports.p[ports.num].str = optarg;
@@ -232,9 +206,9 @@ netmap_port_open(uint32_t idx)
 
 	port = ports.p + idx;
 
-	port->fd = rte_netmap_open("/dev/netmap", O_RDWR); 
+	port->fd = rte_netmap_open("/dev/netmap", O_RDWR);
 
-	rte_snprintf(req.nr_name, sizeof(req.nr_name), "%s", port->str);
+	snprintf(req.nr_name, sizeof(req.nr_name), "%s", port->str);
 	req.nr_version = NETMAP_API;
 	req.nr_ringid = 0;
 
@@ -244,7 +218,7 @@ netmap_port_open(uint32_t idx)
 		return (err);
 	}
 
-	rte_snprintf(req.nr_name, sizeof(req.nr_name), "%s", port->str);
+	snprintf(req.nr_name, sizeof(req.nr_name), "%s", port->str);
 	req.nr_version = NETMAP_API;
 	req.nr_ringid = 0;
 
@@ -263,7 +237,7 @@ netmap_port_open(uint32_t idx)
 		printf("[E] NETMAP mmap failed for fd: %d)\n", port->fd);
 		return (-ENOMEM);
 	}
-	
+
 	port->nmif = NETMAP_IF(ports.mem, req.nr_offset);
 
 	port->tx_ring = NETMAP_TXRING(port->nmif, 0);
@@ -294,18 +268,11 @@ int main(int argc, char *argv[])
 	if (ports.num == 0)
 		rte_exit(EXIT_FAILURE, "no ports specified\n");
 
-	err = rte_eal_pci_probe();
-	if (err < 0)
-		rte_exit(EXIT_FAILURE, "rte_eal_pci_probe(): error %d\n", err);
-
 	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");