[dpdk-stable] patch 'net/e1000: fix zeroing of RSS config' has been queued to LTS release 18.11.6

Kevin Traynor ktraynor at redhat.com
Tue Dec 10 15:59:00 CET 2019


Hi,

FYI, your patch has been queued to LTS release 18.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 12/16/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.

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/a15e444cb4c6da13eb8702458a56b92c073d42ca

Thanks.

Kevin.

---
>From a15e444cb4c6da13eb8702458a56b92c073d42ca Mon Sep 17 00:00:00 2001
From: Congwen Zhang <zhang.congwen at zte.com.cn>
Date: Wed, 7 Aug 2019 16:31:45 +0800
Subject: [PATCH] net/e1000: fix zeroing of RSS config

[ upstream commit 0e4949639ba4e915e7b799f7764b83e124e73669 ]

The type of rss_conf is struct igb_rte_flow_rss_conf *,
 not struct rte_eth_rss_conf *.

Fixes: 424ae915baf0 ("net/e1000: move RSS to flow API")

Signed-off-by: Congwen Zhang <zhang.congwen at zte.com.cn>
Reviewed-by: Xiaolong Ye <xiaolong.ye at intel.com>
---
 drivers/net/e1000/igb_flow.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/e1000/igb_flow.c b/drivers/net/e1000/igb_flow.c
index 77ac4a5bc..fedb12a29 100644
--- a/drivers/net/e1000/igb_flow.c
+++ b/drivers/net/e1000/igb_flow.c
@@ -1382,5 +1382,5 @@ igb_parse_rss_filter(struct rte_eth_dev *dev,
 	NEXT_ITEM_OF_ACTION(act, actions, index);
 	if (act->type != RTE_FLOW_ACTION_TYPE_END) {
-		memset(rss_conf, 0, sizeof(struct rte_eth_rss_conf));
+		memset(rss_conf, 0, sizeof(struct igb_rte_flow_rss_conf));
 		rte_flow_error_set(error, EINVAL,
 			RTE_FLOW_ERROR_TYPE_ACTION,
-- 
2.21.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-12-10 14:49:40.885407818 +0000
+++ 0026-net-e1000-fix-zeroing-of-RSS-config.patch	2019-12-10 14:49:39.034458103 +0000
@@ -1 +1 @@
-From 0e4949639ba4e915e7b799f7764b83e124e73669 Mon Sep 17 00:00:00 2001
+From a15e444cb4c6da13eb8702458a56b92c073d42ca Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 0e4949639ba4e915e7b799f7764b83e124e73669 ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -19 +20 @@
-index 31ca9bb1c..43fef889b 100644
+index 77ac4a5bc..fedb12a29 100644



More information about the stable mailing list