[dpdk-stable] patch 'net/netvsc: fix rndis packet addresses' has been queued to stable release 19.11.6

luca.boccassi at gmail.com luca.boccassi at gmail.com
Wed Oct 28 11:43:32 CET 2020


Hi,

FYI, your patch has been queued to stable release 19.11.6

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 10/30/20. 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. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Thanks.

Luca Boccassi

---
>From 03dae29c5d4bdb737c211750e29fa43ace42557a Mon Sep 17 00:00:00 2001
From: Long Li <longli at microsoft.com>
Date: Fri, 18 Sep 2020 11:53:47 -0700
Subject: [PATCH] net/netvsc: fix rndis packet addresses

[ upstream commit d9fecbe97ba7c1ad0dedf33910d8b4e4e444979a ]

The address should be calculated before type cast, not after.

Fixes: cc0251813277 ("net/netvsc: split send buffers from Tx descriptors")

Reported-by: Souvik Dey <sodey at rbbn.com>
Signed-off-by: Long Li <longli at microsoft.com>
---
 drivers/net/netvsc/hn_rxtx.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/netvsc/hn_rxtx.c b/drivers/net/netvsc/hn_rxtx.c
index df15e56120..90ec8d7d57 100644
--- a/drivers/net/netvsc/hn_rxtx.c
+++ b/drivers/net/netvsc/hn_rxtx.c
@@ -160,8 +160,8 @@ static void hn_txd_init(struct rte_mempool *mp __rte_unused,
 
 	txd->queue_id = txq->queue_id;
 	txd->chim_index = NVS_CHIM_IDX_INVALID;
-	txd->rndis_pkt = (struct rndis_packet_msg *)(char *)txq->tx_rndis
-		+ idx * HN_RNDIS_PKT_ALIGNED;
+	txd->rndis_pkt = (struct rndis_packet_msg *)((char *)txq->tx_rndis
+		+ idx * HN_RNDIS_PKT_ALIGNED);
 }
 
 int
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-10-28 10:35:13.431507667 +0000
+++ 0053-net-netvsc-fix-rndis-packet-addresses.patch	2020-10-28 10:35:11.516830200 +0000
@@ -1,12 +1,13 @@
-From d9fecbe97ba7c1ad0dedf33910d8b4e4e444979a Mon Sep 17 00:00:00 2001
+From 03dae29c5d4bdb737c211750e29fa43ace42557a Mon Sep 17 00:00:00 2001
 From: Long Li <longli at microsoft.com>
 Date: Fri, 18 Sep 2020 11:53:47 -0700
 Subject: [PATCH] net/netvsc: fix rndis packet addresses
 
+[ upstream commit d9fecbe97ba7c1ad0dedf33910d8b4e4e444979a ]
+
 The address should be calculated before type cast, not after.
 
 Fixes: cc0251813277 ("net/netvsc: split send buffers from Tx descriptors")
-Cc: stable at dpdk.org
 
 Reported-by: Souvik Dey <sodey at rbbn.com>
 Signed-off-by: Long Li <longli at microsoft.com>
@@ -15,7 +16,7 @@
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/net/netvsc/hn_rxtx.c b/drivers/net/netvsc/hn_rxtx.c
-index 3e8d3b407d..65f1abae51 100644
+index df15e56120..90ec8d7d57 100644
 --- a/drivers/net/netvsc/hn_rxtx.c
 +++ b/drivers/net/netvsc/hn_rxtx.c
 @@ -160,8 +160,8 @@ static void hn_txd_init(struct rte_mempool *mp __rte_unused,


More information about the stable mailing list