diff options
Diffstat (limited to 'examples/quota_watermark')
-rw-r--r-- | examples/quota_watermark/qw/init.c | 8 | ||||
-rw-r--r-- | examples/quota_watermark/qw/init.h | 4 | ||||
-rw-r--r-- | examples/quota_watermark/qw/main.c | 14 | ||||
-rw-r--r-- | examples/quota_watermark/qw/main.h | 2 |
4 files changed, 14 insertions, 14 deletions
diff --git a/examples/quota_watermark/qw/init.c b/examples/quota_watermark/qw/init.c index 083a37a9..37b03626 100644 --- a/examples/quota_watermark/qw/init.c +++ b/examples/quota_watermark/qw/init.c @@ -73,7 +73,7 @@ static struct rte_eth_fc_conf fc_conf = { }; -void configure_eth_port(uint8_t port_id) +void configure_eth_port(uint16_t port_id) { int ret; uint16_t nb_rxd = RX_DESC_PER_QUEUE; @@ -135,7 +135,7 @@ init_dpdk(void) rte_exit(EXIT_FAILURE, "Not enough ethernet port available\n"); } -void init_ring(int lcore_id, uint8_t port_id) +void init_ring(int lcore_id, uint16_t port_id) { struct rte_ring *ring; char ring_name[RTE_RING_NAMESIZE]; @@ -156,12 +156,12 @@ void init_ring(int lcore_id, uint8_t port_id) void pair_ports(void) { - uint8_t i, j; + uint16_t i, j; /* Pair ports with their "closest neighbour" in the portmask */ for (i = 0; i < RTE_MAX_ETHPORTS; i++) if (is_bit_set(i, portmask)) - for (j = (uint8_t) (i + 1); j < RTE_MAX_ETHPORTS; j++) + for (j = i + 1; j < RTE_MAX_ETHPORTS; j++) if (is_bit_set(j, portmask)) { port_pairs[i] = j; port_pairs[j] = i; diff --git a/examples/quota_watermark/qw/init.h b/examples/quota_watermark/qw/init.h index 6d0af3ab..2bfec2b1 100644 --- a/examples/quota_watermark/qw/init.h +++ b/examples/quota_watermark/qw/init.h @@ -34,9 +34,9 @@ #ifndef _INIT_H_ #define _INIT_H_ -void configure_eth_port(uint8_t port_id); +void configure_eth_port(uint16_t port_id); void init_dpdk(void); -void init_ring(int lcore_id, uint8_t port_id); +void init_ring(int lcore_id, uint16_t port_id); void pair_ports(void); void setup_shared_variables(void); diff --git a/examples/quota_watermark/qw/main.c b/examples/quota_watermark/qw/main.c index d4fcfde4..fe174526 100644 --- a/examples/quota_watermark/qw/main.c +++ b/examples/quota_watermark/qw/main.c @@ -69,13 +69,13 @@ int *quota; unsigned int *low_watermark; unsigned int *high_watermark; -uint8_t port_pairs[RTE_MAX_ETHPORTS]; +uint16_t port_pairs[RTE_MAX_ETHPORTS]; struct rte_ring *rings[RTE_MAX_LCORE][RTE_MAX_ETHPORTS]; struct rte_mempool *mbuf_pool; -static void send_pause_frame(uint8_t port_id, uint16_t duration) +static void send_pause_frame(uint16_t port_id, uint16_t duration) { struct rte_mbuf *mbuf; struct ether_fc_frame *pause_frame; @@ -155,7 +155,7 @@ receive_stage(__attribute__((unused)) void *args) { int i, ret; - uint8_t port_id; + uint16_t port_id; uint16_t nb_rx_pkts; unsigned int lcore_id; @@ -216,7 +216,7 @@ pipeline_stage(__attribute__((unused)) void *args) int i, ret; int nb_dq_pkts; - uint8_t port_id; + uint16_t port_id; unsigned int lcore_id, previous_lcore_id; unsigned int free; @@ -279,8 +279,8 @@ send_stage(__attribute__((unused)) void *args) { uint16_t nb_dq_pkts; - uint8_t port_id; - uint8_t dest_port_id; + uint16_t port_id; + uint16_t dest_port_id; unsigned int lcore_id, previous_lcore_id; @@ -324,7 +324,7 @@ main(int argc, char **argv) int ret; unsigned int lcore_id, master_lcore_id, last_lcore_id; - uint8_t port_id; + uint16_t port_id; rte_log_set_global_level(RTE_LOG_INFO); diff --git a/examples/quota_watermark/qw/main.h b/examples/quota_watermark/qw/main.h index 8c8e3116..ebed7b2f 100644 --- a/examples/quota_watermark/qw/main.h +++ b/examples/quota_watermark/qw/main.h @@ -45,7 +45,7 @@ extern int *quota; extern unsigned int *low_watermark; extern unsigned int *high_watermark; -extern uint8_t port_pairs[RTE_MAX_ETHPORTS]; +extern uint16_t port_pairs[RTE_MAX_ETHPORTS]; extern struct rte_ring *rings[RTE_MAX_LCORE][RTE_MAX_ETHPORTS]; extern struct rte_mempool *mbuf_pool; |