From 52f7a5aeb190427232ba0289ec156e91ae68d3e6 Mon Sep 17 00:00:00 2001 From: Jasvinder Singh Date: Mon, 11 Apr 2016 18:54:46 +0100 Subject: [PATCH] port: fix burst size mask type Fixes the variable bsz_mask type from uint32_t to uint64_t Fixes: 4d97e8b565cc ("port: ethdev") Fixes: 304c8091e90a ("port: add ethdev writer nodrop") Fixes: 8dceb6aa6ecf ("port: hierarchical scheduler") Fixes: 3e5966837a09 ("port: new Tx burst implementation of ring writer") Fixes: 5f4cd47309d6 ("port: add ring writer nodrop") Signed-off-by: Jasvinder Singh Acked-by: Cristian Dumitrescu --- lib/librte_port/rte_port_ethdev.c | 4 ++-- lib/librte_port/rte_port_ring.c | 4 ++-- lib/librte_port/rte_port_sched.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/librte_port/rte_port_ethdev.c b/lib/librte_port/rte_port_ethdev.c index 1c346025a7..73e5f18545 100644 --- a/lib/librte_port/rte_port_ethdev.c +++ b/lib/librte_port/rte_port_ethdev.c @@ -229,7 +229,7 @@ rte_port_ethdev_writer_tx_bulk(void *port, { struct rte_port_ethdev_writer *p = (struct rte_port_ethdev_writer *) port; - uint32_t bsz_mask = p->bsz_mask; + uint64_t bsz_mask = p->bsz_mask; uint32_t tx_buf_count = p->tx_buf_count; uint64_t expr = (pkts_mask & (pkts_mask + 1)) | ((pkts_mask & bsz_mask) ^ bsz_mask); @@ -436,7 +436,7 @@ rte_port_ethdev_writer_nodrop_tx_bulk(void *port, struct rte_port_ethdev_writer_nodrop *p = (struct rte_port_ethdev_writer_nodrop *) port; - uint32_t bsz_mask = p->bsz_mask; + uint64_t bsz_mask = p->bsz_mask; uint32_t tx_buf_count = p->tx_buf_count; uint64_t expr = (pkts_mask & (pkts_mask + 1)) | ((pkts_mask & bsz_mask) ^ bsz_mask); diff --git a/lib/librte_port/rte_port_ring.c b/lib/librte_port/rte_port_ring.c index b847fea3f1..d36e12d615 100644 --- a/lib/librte_port/rte_port_ring.c +++ b/lib/librte_port/rte_port_ring.c @@ -300,7 +300,7 @@ rte_port_ring_writer_tx_bulk_internal(void *port, struct rte_port_ring_writer *p = (struct rte_port_ring_writer *) port; - uint32_t bsz_mask = p->bsz_mask; + uint64_t bsz_mask = p->bsz_mask; uint32_t tx_buf_count = p->tx_buf_count; uint64_t expr = (pkts_mask & (pkts_mask + 1)) | ((pkts_mask & bsz_mask) ^ bsz_mask); @@ -614,7 +614,7 @@ rte_port_ring_writer_nodrop_tx_bulk_internal(void *port, struct rte_port_ring_writer_nodrop *p = (struct rte_port_ring_writer_nodrop *) port; - uint32_t bsz_mask = p->bsz_mask; + uint64_t bsz_mask = p->bsz_mask; uint32_t tx_buf_count = p->tx_buf_count; uint64_t expr = (pkts_mask & (pkts_mask + 1)) | ((pkts_mask & bsz_mask) ^ bsz_mask); diff --git a/lib/librte_port/rte_port_sched.c b/lib/librte_port/rte_port_sched.c index c5ff8ab950..25217d625d 100644 --- a/lib/librte_port/rte_port_sched.c +++ b/lib/librte_port/rte_port_sched.c @@ -214,7 +214,7 @@ rte_port_sched_writer_tx_bulk(void *port, uint64_t pkts_mask) { struct rte_port_sched_writer *p = (struct rte_port_sched_writer *) port; - uint32_t bsz_mask = p->bsz_mask; + uint64_t bsz_mask = p->bsz_mask; uint32_t tx_buf_count = p->tx_buf_count; uint64_t expr = (pkts_mask & (pkts_mask + 1)) | ((pkts_mask & bsz_mask) ^ bsz_mask);