diff mbox

[dpdk-dev,v2] net/bonding: check dequeue result before proceeding

Message ID 1516799473-16079-1-git-send-email-radu.nicolau@intel.com (mailing list archive)
State Accepted, archived
Delegated to: Ferruh Yigit
Headers

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation fail Compilation issues

Commit Message

Radu Nicolau Jan. 24, 2018, 1:11 p.m. UTC 
  Fixes: 09150784a776 ("net/bonding: burst mode hash calculation")
Coverity issue: 257015
Cc: stable@dpdk.org

Signed-off-by: Radu Nicolau <radu.nicolau@intel.com>
---
v2: updated commit message

 drivers/net/bonding/rte_eth_bond_pmd.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

Comments

Ferruh Yigit Jan. 25, 2018, 2:21 p.m. UTC | #1 
On 1/24/2018 1:11 PM, Radu Nicolau wrote:
> Coverity issue: 257015
> Fixes: 09150784a776 ("net/bonding: burst mode hash calculation")
> Cc: stable@dpdk.org
> 
> Signed-off-by: Radu Nicolau <radu.nicolau@intel.com>

Applied to dpdk-next-net/master, thanks.
diff mbox

Patch

diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c
index 158f3aa..cc06ff4 100644
--- a/drivers/net/bonding/rte_eth_bond_pmd.c
+++ b/drivers/net/bonding/rte_eth_bond_pmd.c
@@ -1435,17 +1435,17 @@  bond_ethdev_tx_burst_8023ad(void *queue, struct rte_mbuf **bufs,
 		if (likely(rte_ring_empty(port->tx_ring)))
 			continue;
 
-		rte_ring_dequeue(port->tx_ring,	(void **)&ctrl_pkt);
-
-		slave_tx_count = rte_eth_tx_burst(slave_port_ids[i],
+		if (rte_ring_dequeue(port->tx_ring,
+				     (void **)&ctrl_pkt) != -ENOENT) {
+			slave_tx_count = rte_eth_tx_burst(slave_port_ids[i],
 					bd_tx_q->queue_id, &ctrl_pkt, 1);
-
-		/*
-		 * re-enqueue LAG control plane packets to buffering
-		 * ring if transmission fails so the packet isn't lost.
-		 */
-		if (slave_tx_count != 1)
-			rte_ring_enqueue(port->tx_ring,	ctrl_pkt);
+			/*
+			 * re-enqueue LAG control plane packets to buffering
+			 * ring if transmission fails so the packet isn't lost.
+			 */
+			if (slave_tx_count != 1)
+				rte_ring_enqueue(port->tx_ring,	ctrl_pkt);
+		}
 	}
 
 	return total_tx_count;