Code Review
/
deb_dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
New upstream version 17.11-rc3
[deb_dpdk.git]
/
examples
/
bond
/
main.c
diff --git
a/examples/bond/main.c
b/examples/bond/main.c
index
2d019d4
..
8e3b1f3
100644
(file)
--- a/
examples/bond/main.c
+++ b/
examples/bond/main.c
@@
-51,7
+51,6
@@
#include <rte_log.h>
#include <rte_memory.h>
#include <rte_memcpy.h>
#include <rte_log.h>
#include <rte_memory.h>
#include <rte_memcpy.h>
-#include <rte_memzone.h>
#include <rte_eal.h>
#include <rte_launch.h>
#include <rte_atomic.h>
#include <rte_eal.h>
#include <rte_launch.h>
#include <rte_atomic.h>
@@
-61,7
+60,6
@@
#include <rte_per_lcore.h>
#include <rte_branch_prediction.h>
#include <rte_interrupts.h>
#include <rte_per_lcore.h>
#include <rte_branch_prediction.h>
#include <rte_interrupts.h>
-#include <rte_pci.h>
#include <rte_random.h>
#include <rte_debug.h>
#include <rte_ether.h>
#include <rte_random.h>
#include <rte_debug.h>
#include <rte_ether.h>
@@
-141,10
+139,10
@@
addr.addr_bytes[0], addr.addr_bytes[1], addr.addr_bytes[2], \
addr.addr_bytes[3], addr.addr_bytes[4], addr.addr_bytes[5])
addr.addr_bytes[0], addr.addr_bytes[1], addr.addr_bytes[2], \
addr.addr_bytes[3], addr.addr_bytes[4], addr.addr_bytes[5])
-uint
8
_t slaves[RTE_MAX_ETHPORTS];
-uint
8
_t slaves_count;
+uint
16
_t slaves[RTE_MAX_ETHPORTS];
+uint
16
_t slaves_count;
-static uint
8_t BOND_PORT = 0x
ff;
+static uint
16_t BOND_PORT = 0xff
ff;
static struct rte_mempool *mbuf_pool;
static struct rte_mempool *mbuf_pool;
@@
-171,7
+169,7
@@
static struct rte_eth_conf port_conf = {
};
static void
};
static void
-slave_port_init(uint
8
_t portid, struct rte_mempool *mbuf_pool)
+slave_port_init(uint
16
_t portid, struct rte_mempool *mbuf_pool)
{
int retval;
uint16_t nb_rxd = RTE_RX_DESC_DEFAULT;
{
int retval;
uint16_t nb_rxd = RTE_RX_DESC_DEFAULT;
@@
-215,7
+213,7
@@
slave_port_init(uint8_t portid, struct rte_mempool *mbuf_pool)
struct ether_addr addr;
rte_eth_macaddr_get(portid, &addr);
struct ether_addr addr;
rte_eth_macaddr_get(portid, &addr);
- printf("Port %u MAC: ",
(unsigned)
portid);
+ printf("Port %u MAC: ", portid);
PRINT_MAC(addr);
printf("\n");
}
PRINT_MAC(addr);
printf("\n");
}
@@
-234,7
+232,7
@@
bond_port_init(struct rte_mempool *mbuf_pool)
rte_exit(EXIT_FAILURE,
"Faled to create bond port\n");
rte_exit(EXIT_FAILURE,
"Faled to create bond port\n");
- BOND_PORT =
(uint8_t)
retval;
+ BOND_PORT = retval;
retval = rte_eth_dev_configure(BOND_PORT, 1, 1, &port_conf);
if (retval != 0)
retval = rte_eth_dev_configure(BOND_PORT, 1, 1, &port_conf);
if (retval != 0)
@@
-675,10
+673,10
@@
static void cmd_show_parsed(__attribute__((unused)) void *parsed_result,
struct cmdline *cl,
__attribute__((unused)) void *data)
{
struct cmdline *cl,
__attribute__((unused)) void *data)
{
- uint
8
_t slaves[16] = {0};
+ uint
16
_t slaves[16] = {0};
uint8_t len = 16;
struct ether_addr addr;
uint8_t len = 16;
struct ether_addr addr;
- uint
8
_t i = 0;
+ uint
16
_t i = 0;
while (i < slaves_count) {
rte_eth_macaddr_get(i, &addr);
while (i < slaves_count) {
rte_eth_macaddr_get(i, &addr);