From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 3BBA5A04F0 for ; Tue, 10 Dec 2019 16:00:55 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 30F611B13C; Tue, 10 Dec 2019 16:00:55 +0100 (CET) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) by dpdk.org (Postfix) with ESMTP id 4E3B51BE84 for ; Tue, 10 Dec 2019 16:00:53 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575990052; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=V6tt4iurS0vtnYJE4//71q2TPqWAyL1snWtTR7hacgc=; b=LtYLnVkF05XwoRMu5fR/J021wZ/M+EU8RvzeT3yW8yk3DIroEiOHHO319ziJMBzJhwHlk/ Y9c6Q9QzjHVY89ebtq8tXW9EKdKLBTSJJN+oE94n3yeWOrAvFPK1WPe4xXD4T0qQuEVrxe Pov0A2xF/vkkHIRdK879xVUZ2B7knmY= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-23-K-tj2OazNxW80-WiZAOszA-1; Tue, 10 Dec 2019 10:00:40 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B5804911E9; Tue, 10 Dec 2019 15:00:39 +0000 (UTC) Received: from rh.redhat.com (ovpn-116-64.ams2.redhat.com [10.36.116.64]) by smtp.corp.redhat.com (Postfix) with ESMTP id BDA3D5DA2C; Tue, 10 Dec 2019 15:00:38 +0000 (UTC) From: Kevin Traynor To: Congwen Zhang Cc: Xiaolong Ye , dpdk stable Date: Tue, 10 Dec 2019 14:59:00 +0000 Message-Id: <20191210145937.32755-26-ktraynor@redhat.com> In-Reply-To: <20191210145937.32755-1-ktraynor@redhat.com> References: <20191210145937.32755-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-MC-Unique: K-tj2OazNxW80-WiZAOszA-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Subject: [dpdk-stable] patch 'net/e1000: fix zeroing of RSS config' has been queued to LTS release 18.11.6 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" 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 rebasi= ng (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/a15e444cb4c6da13eb= 8702458a56b92c073d42ca Thanks. Kevin. --- >From a15e444cb4c6da13eb8702458a56b92c073d42ca Mon Sep 17 00:00:00 2001 From: Congwen Zhang 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 Reviewed-by: Xiaolong Ye --- 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, =09NEXT_ITEM_OF_ACTION(act, actions, index); =09if (act->type !=3D RTE_FLOW_ACTION_TYPE_END) { -=09=09memset(rss_conf, 0, sizeof(struct rte_eth_rss_conf)); +=09=09memset(rss_conf, 0, sizeof(struct igb_rte_flow_rss_conf)); =09=09rte_flow_error_set(error, EINVAL, =09=09=09RTE_FLOW_ERROR_TYPE_ACTION, --=20 2.21.0 --- Diff of the applied patch vs upstream commit (please double-check if non-= empty: --- --- -=092019-12-10 14:49:40.885407818 +0000 +++ 0026-net-e1000-fix-zeroing-of-RSS-config.patch=092019-12-10 14:49:39.03= 4458103 +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@dpdk.org @@ -19 +20 @@ -index 31ca9bb1c..43fef889b 100644 +index 77ac4a5bc..fedb12a29 100644