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

Kevin Traynor ktraynor at redhat.com
Thu Jan 31 16:48:09 CET 2019


Hi,

FYI, your patch has been queued to LTS release 18.11.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 02/07/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. 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.

Kevin Traynor

---
>From f21e93ea57ffb277b2da7206bc4ab522a4fab4be 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 8dc1a4af8..a6b97e164 100644
--- a/drivers/net/i40e/i40e_ethdev.c
+++ b/drivers/net/i40e/i40e_ethdev.c
@@ -7408,5 +7408,5 @@ i40e_get_rss_key(struct i40e_vsi *vsi, uint8_t *key, uint8_t *key_len)
 
 	if (!key || !key_len)
-		return -EINVAL;
+		return 0;
 
 	if (pf->flags & I40E_FLAG_RSS_AQ_CAPABLE) {
@@ -7493,4 +7493,7 @@ i40e_dev_rss_hash_conf_get(struct rte_eth_dev *dev,
 	int ret;
 
+	if (!rss_conf)
+		return -EINVAL;
+
 	ret = i40e_get_rss_key(pf->main_vsi, rss_conf->rss_key,
 			 &rss_conf->rss_key_len);
-- 
2.19.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-01-31 15:44:05.768062227 +0000
+++ 0001-net-i40e-fix-get-RSS-conf.patch	2019-01-31 15:44:05.000000000 +0000
@@ -1,14 +1,15 @@
-From 286a809c99c033f895c6b08c2af4b741f17ae29b Mon Sep 17 00:00:00 2001
+From f21e93ea57ffb277b2da7206bc4ab522a4fab4be 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>


More information about the stable mailing list