[dpdk-stable] patch 'net/i40e: fix get RSS conf' has been queued to LTS release 17.11.6

[Yongseok Koh]

Hi,

FYI, your patch has been queued to LTS release 17.11.6

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objection by 03/13/19. So please
shout if anyone has objection.

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 c33f5a216f01985f4846c48a4fef8c1793d08012 Mon Sep 17 00:00:00 2001
From: Qiming Yang <qiming.yang at intel.com>
Date: Mon, 24 Dec 2018 23:34:02 +0800
Subject: [PATCH] net/i40e: fix get RSS conf

[ upstream commit 286a809c99c033f895c6b08c2af4b741f17ae29b ]

rte_eth_dev_rss_hash_conf_get API doesn't force 'rss_conf.rss_key'
to be not NULL, so rss_key = NULL should be alllowed in i40e
driver.

Fixes: 16321de09396 ("ethdev: allow to get RSS hash functions and key")

Signed-off-by: Qiming Yang <qiming.yang at intel.com>
Acked-by: Qi Zhang <qi.z.zhang at intel.com>
---
 drivers/net/i40e/i40e_ethdev.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
index 06c955858..60b63e027 100644
--- a/drivers/net/i40e/i40e_ethdev.c
+++ b/drivers/net/i40e/i40e_ethdev.c
@@ -7041,7 +7041,7 @@ i40e_get_rss_key(struct i40e_vsi *vsi, uint8_t *key, uint8_t *key_len)
 	int ret;
 
 	if (!key || !key_len)
-		return -EINVAL;
+		return 0;
 
 	if (pf->flags & I40E_FLAG_RSS_AQ_CAPABLE) {
 		ret = i40e_aq_get_rss_key(hw, vsi->vsi_id,
@@ -7115,6 +7115,9 @@ i40e_dev_rss_hash_conf_get(struct rte_eth_dev *dev,
 	uint64_t hena;
 	int ret;
 
+	if (!rss_conf)
+		return -EINVAL;
+
 	ret = i40e_get_rss_key(pf->main_vsi, rss_conf->rss_key,
 			 &rss_conf->rss_key_len);
 	if (ret)
-- 
2.11.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-03-08 09:46:41.521779870 -0800
+++ 0024-net-i40e-fix-get-RSS-conf.patch	2019-03-08 09:46:40.089399000 -0800
@@ -1,14 +1,15 @@
-From 286a809c99c033f895c6b08c2af4b741f17ae29b Mon Sep 17 00:00:00 2001
+From c33f5a216f01985f4846c48a4fef8c1793d08012 Mon Sep 17 00:00:00 2001
 From: Qiming Yang <qiming.yang at intel.com>
 Date: Mon, 24 Dec 2018 23:34:02 +0800
 Subject: [PATCH] net/i40e: fix get RSS conf
 
+[ upstream commit 286a809c99c033f895c6b08c2af4b741f17ae29b ]
+
 rte_eth_dev_rss_hash_conf_get API doesn't force 'rss_conf.rss_key'
 to be not NULL, so rss_key = NULL should be alllowed in i40e
 driver.
 
 Fixes: 16321de09396 ("ethdev: allow to get RSS hash functions and key")
-Cc: stable at dpdk.org
 
 Signed-off-by: Qiming Yang <qiming.yang at intel.com>
 Acked-by: Qi Zhang <qi.z.zhang at intel.com>
@@ -17,10 +18,10 @@
  1 file changed, 4 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
-index 8dc1a4af8..a6b97e164 100644
+index 06c955858..60b63e027 100644
 --- a/drivers/net/i40e/i40e_ethdev.c
 +++ b/drivers/net/i40e/i40e_ethdev.c
-@@ -7407,7 +7407,7 @@ i40e_get_rss_key(struct i40e_vsi *vsi, uint8_t *key, uint8_t *key_len)
+@@ -7041,7 +7041,7 @@ i40e_get_rss_key(struct i40e_vsi *vsi, uint8_t *key, uint8_t *key_len)
  	int ret;
  
  	if (!key || !key_len)
@@ -29,7 +30,7 @@
  
  	if (pf->flags & I40E_FLAG_RSS_AQ_CAPABLE) {
  		ret = i40e_aq_get_rss_key(hw, vsi->vsi_id,
-@@ -7492,6 +7492,9 @@ i40e_dev_rss_hash_conf_get(struct rte_eth_dev *dev,
+@@ -7115,6 +7115,9 @@ i40e_dev_rss_hash_conf_get(struct rte_eth_dev *dev,
  	uint64_t hena;
  	int ret;