[dpdk-stable] patch 'ethdev: explicit cast of buffered Tx number' has been queued to LTS release 17.11.5

Yongseok Koh yskoh at mellanox.com
Thu Jan 3 09:13:29 CET 2019


Hi,

FYI, your patch has been queued to LTS release 17.11.5

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 01/04/19. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the patch applied
to the branch. If the code is different (ie: not only metadata diffs), due for example to
a change in context or macro names, please double check it.

Thanks.

Yongseok

---
>From 9279c2accec9ced9b2fb1c6a62263110ed904485 Mon Sep 17 00:00:00 2001
From: Andy Green <andy at warmcat.com>
Date: Sat, 12 May 2018 10:00:27 +0800
Subject: [PATCH] ethdev: explicit cast of buffered Tx number

[ backported from upstream commit b90406b9f7340466cbda287cd7454fae68868348 ]

In function 'rte_eth_tx_buffer_flush':
rte_ethdev.h:4248:55:
warning: conversion from 'int' to 'uint16_t'
{aka 'short unsigned int'} may change value [-Wconversion]
   buffer->error_callback(&buffer->pkts[sent], to_send - sent,

Fixes: d6c99e62c852 ("ethdev: add buffered Tx")

Signed-off-by: Andy Green <andy at warmcat.com>
Reviewed-by: Stephen Hemminger <stephen at networkplumber.org>
---
 lib/librte_ether/rte_ethdev.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/librte_ether/rte_ethdev.h b/lib/librte_ether/rte_ethdev.h
index c4f68d1b9..bbca590d4 100644
--- a/lib/librte_ether/rte_ethdev.h
+++ b/lib/librte_ether/rte_ethdev.h
@@ -3361,8 +3361,9 @@ rte_eth_tx_buffer_flush(uint16_t port_id, uint16_t queue_id,
 
 	/* All packets sent, or to be dealt with by callback below */
 	if (unlikely(sent != to_send))
-		buffer->error_callback(&buffer->pkts[sent], to_send - sent,
-				buffer->error_userdata);
+		buffer->error_callback(&buffer->pkts[sent],
+				       (uint16_t)(to_send - sent),
+				       buffer->error_userdata);
 
 	return sent;
 }
-- 
2.11.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-01-02 23:59:12.427744670 -0800
+++ 0006-ethdev-explicit-cast-of-buffered-Tx-number.patch	2019-01-02 23:59:12.018816000 -0800
@@ -1,8 +1,10 @@
-From b90406b9f7340466cbda287cd7454fae68868348 Mon Sep 17 00:00:00 2001
+From 9279c2accec9ced9b2fb1c6a62263110ed904485 Mon Sep 17 00:00:00 2001
 From: Andy Green <andy at warmcat.com>
 Date: Sat, 12 May 2018 10:00:27 +0800
 Subject: [PATCH] ethdev: explicit cast of buffered Tx number
 
+[ backported from upstream commit b90406b9f7340466cbda287cd7454fae68868348 ]
+
 In function 'rte_eth_tx_buffer_flush':
 rte_ethdev.h:4248:55:
 warning: conversion from 'int' to 'uint16_t'
@@ -10,19 +12,18 @@
    buffer->error_callback(&buffer->pkts[sent], to_send - sent,
 
 Fixes: d6c99e62c852 ("ethdev: add buffered Tx")
-Cc: stable at dpdk.org
 
 Signed-off-by: Andy Green <andy at warmcat.com>
 Reviewed-by: Stephen Hemminger <stephen at networkplumber.org>
 ---
- lib/librte_ethdev/rte_ethdev.h | 5 +++--
+ lib/librte_ether/rte_ethdev.h | 5 +++--
  1 file changed, 3 insertions(+), 2 deletions(-)
 
-diff --git a/lib/librte_ethdev/rte_ethdev.h b/lib/librte_ethdev/rte_ethdev.h
-index 7ccf4bae6..49c2ebbd5 100644
---- a/lib/librte_ethdev/rte_ethdev.h
-+++ b/lib/librte_ethdev/rte_ethdev.h
-@@ -4240,8 +4240,9 @@ rte_eth_tx_buffer_flush(uint16_t port_id, uint16_t queue_id,
+diff --git a/lib/librte_ether/rte_ethdev.h b/lib/librte_ether/rte_ethdev.h
+index c4f68d1b9..bbca590d4 100644
+--- a/lib/librte_ether/rte_ethdev.h
++++ b/lib/librte_ether/rte_ethdev.h
+@@ -3361,8 +3361,9 @@ rte_eth_tx_buffer_flush(uint16_t port_id, uint16_t queue_id,
  
  	/* All packets sent, or to be dealt with by callback below */
  	if (unlikely(sent != to_send))


More information about the stable mailing list