[dpdk-stable] patch 'net/i40e: remove redundant reset of queue number' has been queued to stable release 18.08.1

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 18.08.1

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 12/18/18. 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.

Kevin Traynor

---
>From c78b49bd6d7f047588db6010636fe6c248a500ab Mon Sep 17 00:00:00 2001
From: Zhirun Yan <zhirun.yan at intel.com>
Date: Thu, 13 Dec 2018 12:49:28 +0000
Subject: [PATCH] net/i40e: remove redundant reset of queue number

[ upstream commit ef8b7c505f10897621c0801d8ef3e961385246f8 ]

Before this patch, there are two functions will call
i40e_dev_free_queues to free queues. For rte_eth_dev_close(), its
redundant because of duplication. For rte_eth_dev_reset() its
redundant because of not necessary, since following dev_configure
is required after dev_reset and it will be updated correctly.

This patch removes redundant code in i40e_dev_free_queues().

Fixes: 6b4537128394 ("i40e: free queue memory when closing")

Signed-off-by: Zhirun Yan <zhirun.yan at intel.com>
Signed-off-by: Haiyue Wang <haiyue.wang at intel.com>
Acked-by: Qi Zhang <qi.z.zhang at intel.com>
---
 drivers/net/i40e/i40e_rxtx.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/net/i40e/i40e_rxtx.c b/drivers/net/i40e/i40e_rxtx.c
index 7cc35c19c..cdc14b918 100644
--- a/drivers/net/i40e/i40e_rxtx.c
+++ b/drivers/net/i40e/i40e_rxtx.c
@@ -2753,5 +2753,4 @@ i40e_dev_free_queues(struct rte_eth_dev *dev)
 		dev->data->rx_queues[i] = NULL;
 	}
-	dev->data->nb_rx_queues = 0;
 
 	for (i = 0; i < dev->data->nb_tx_queues; i++) {
@@ -2761,5 +2760,4 @@ i40e_dev_free_queues(struct rte_eth_dev *dev)
 		dev->data->tx_queues[i] = NULL;
 	}
-	dev->data->nb_tx_queues = 0;
 }
 
-- 
2.19.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2018-12-14 17:49:48.238205568 +0000
+++ 0019-net-i40e-remove-redundant-reset-of-queue-number.patch	2018-12-14 17:49:47.000000000 +0000
@@ -1,8 +1,10 @@
-From ef8b7c505f10897621c0801d8ef3e961385246f8 Mon Sep 17 00:00:00 2001
+From c78b49bd6d7f047588db6010636fe6c248a500ab Mon Sep 17 00:00:00 2001
 From: Zhirun Yan <zhirun.yan at intel.com>
 Date: Thu, 13 Dec 2018 12:49:28 +0000
 Subject: [PATCH] net/i40e: remove redundant reset of queue number
 
+[ upstream commit ef8b7c505f10897621c0801d8ef3e961385246f8 ]
+
 Before this patch, there are two functions will call
 i40e_dev_free_queues to free queues. For rte_eth_dev_close(), its
 redundant because of duplication. For rte_eth_dev_reset() its
@@ -12,7 +14,6 @@
 This patch removes redundant code in i40e_dev_free_queues().
 
 Fixes: 6b4537128394 ("i40e: free queue memory when closing")
-Cc: stable at dpdk.org
 
 Signed-off-by: Zhirun Yan <zhirun.yan at intel.com>
 Signed-off-by: Haiyue Wang <haiyue.wang at intel.com>
@@ -22,16 +23,16 @@
  1 file changed, 2 deletions(-)
 
 diff --git a/drivers/net/i40e/i40e_rxtx.c b/drivers/net/i40e/i40e_rxtx.c
-index ab74a488f..82a170929 100644
+index 7cc35c19c..cdc14b918 100644
 --- a/drivers/net/i40e/i40e_rxtx.c
 +++ b/drivers/net/i40e/i40e_rxtx.c
-@@ -2754,5 +2754,4 @@ i40e_dev_free_queues(struct rte_eth_dev *dev)
+@@ -2753,5 +2753,4 @@ i40e_dev_free_queues(struct rte_eth_dev *dev)
  		dev->data->rx_queues[i] = NULL;
  	}
 -	dev->data->nb_rx_queues = 0;
  
  	for (i = 0; i < dev->data->nb_tx_queues; i++) {
-@@ -2762,5 +2761,4 @@ i40e_dev_free_queues(struct rte_eth_dev *dev)
+@@ -2761,5 +2760,4 @@ i40e_dev_free_queues(struct rte_eth_dev *dev)
  		dev->data->tx_queues[i] = NULL;
  	}
 -	dev->data->nb_tx_queues = 0;