From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id 7AD41A0096 for ; Wed, 8 May 2019 18:03:16 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 70B0937AF; Wed, 8 May 2019 18:03:16 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 5750A4F93 for ; Wed, 8 May 2019 18:03:15 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B3184307D935; Wed, 8 May 2019 16:03:14 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-210.ams2.redhat.com [10.36.117.210]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6F84E60C82; Wed, 8 May 2019 16:03:13 +0000 (UTC) From: Kevin Traynor To: Wei Zhao Cc: Qimai Xiao , Qi Zhang , dpdk stable Date: Wed, 8 May 2019 17:02:22 +0100 Message-Id: <20190508160233.2648-25-ktraynor@redhat.com> In-Reply-To: <20190508160233.2648-1-ktraynor@redhat.com> References: <20190508160233.2648-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.48]); Wed, 08 May 2019 16:03:14 +0000 (UTC) Subject: [dpdk-stable] patch 'net/i40e: fix queue number check' has been queued to LTS release 18.11.2 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.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/14/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/b8d8a5a52d4301a5ec1996d483574c0a3b42e61b Thanks. Kevin Traynor --- >From b8d8a5a52d4301a5ec1996d483574c0a3b42e61b Mon Sep 17 00:00:00 2001 From: Wei Zhao Date: Sun, 28 Apr 2019 14:13:18 +0800 Subject: [PATCH] net/i40e: fix queue number check [ upstream commit f5c76298b4ea90fc7a2b9cd1b2a5d05036e7cc92 ] Remove invalid queue number check which cause unexpected error return. Fixes: ac8d22de2394 ("ethdev: flatten RSS configuration in flow API") Signed-off-by: Wei Zhao Tested-by: Qimai Xiao Acked-by: Qi Zhang --- drivers/net/i40e/i40e_ethdev.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c index 036c34d09..c29d972d6 100644 --- a/drivers/net/i40e/i40e_ethdev.c +++ b/drivers/net/i40e/i40e_ethdev.c @@ -12702,7 +12702,4 @@ i40e_config_rss_filter(struct i40e_pf *pf, } - if (rss_info->conf.queue_num) - return -EINVAL; - /* If both VMDQ and RSS enabled, not all of PF queues are configured. * It's necessary to calculate the actual PF queues that are configured. -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-05-08 16:33:58.730281221 +0100 +++ 0025-net-i40e-fix-queue-number-check.patch 2019-05-08 16:33:57.425577746 +0100 @@ -1 +1 @@ -From f5c76298b4ea90fc7a2b9cd1b2a5d05036e7cc92 Mon Sep 17 00:00:00 2001 +From b8d8a5a52d4301a5ec1996d483574c0a3b42e61b Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit f5c76298b4ea90fc7a2b9cd1b2a5d05036e7cc92 ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index 301193492..62865c5fd 100644 +index 036c34d09..c29d972d6 100644 @@ -22 +23 @@ -@@ -12711,7 +12711,4 @@ i40e_config_rss_filter(struct i40e_pf *pf, +@@ -12702,7 +12702,4 @@ i40e_config_rss_filter(struct i40e_pf *pf,