From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id E95491B117 for ; Wed, 21 Nov 2018 17:06:08 +0100 (CET) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4FDAB88E52; Wed, 21 Nov 2018 16:06:08 +0000 (UTC) Received: from ktraynor.remote.csb (unknown [10.36.118.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2D3E6608E7; Wed, 21 Nov 2018 16:06:06 +0000 (UTC) From: Kevin Traynor To: Ivan Malov Cc: Andrew Rybchenko , dpdk stable Date: Wed, 21 Nov 2018 16:04:05 +0000 Message-Id: <20181121160440.9014-15-ktraynor@redhat.com> In-Reply-To: <20181121160440.9014-1-ktraynor@redhat.com> References: <20181121160440.9014-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Wed, 21 Nov 2018 16:06:08 +0000 (UTC) Subject: [dpdk-stable] patch 'net/sfc/base: fix name of the argument to store RSS flags' has been queued to stable release 18.08.1 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: , X-List-Received-Date: Wed, 21 Nov 2018 16:06:09 -0000 Hi, FYI, your patch has been queued to stable release 18.08.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 11/26/18. 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. 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. Kevin Traynor --- >>From 783dd59cf14af20497c4bff44f1ecfc6bcb52f2d Mon Sep 17 00:00:00 2001 From: Ivan Malov Date: Mon, 10 Sep 2018 10:33:27 +0100 Subject: [PATCH] net/sfc/base: fix name of the argument to store RSS flags [ upstream commit e7feaba71c02418796afbe4356840e725ca6df6b ] The function used to retrieve supported RSS flags has an argument which should be named properly to indicate that it's a pointer. Fixes: 613cbe75ae99 ("net/sfc/base: add a new means to control RSS hash") Signed-off-by: Ivan Malov Signed-off-by: Andrew Rybchenko --- drivers/net/sfc/base/efx.h | 2 +- drivers/net/sfc/base/efx_rx.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/net/sfc/base/efx.h b/drivers/net/sfc/base/efx.h index 53cbc9858..24fdd867d 100644 --- a/drivers/net/sfc/base/efx.h +++ b/drivers/net/sfc/base/efx.h @@ -2225,5 +2225,5 @@ efx_rx_scale_hash_flags_get( __in efx_nic_t *enp, __in efx_rx_hash_alg_t hash_alg, - __inout_ecount(EFX_RX_HASH_NFLAGS) unsigned int *flags, + __inout_ecount(EFX_RX_HASH_NFLAGS) unsigned int *flagsp, __out unsigned int *nflagsp); diff --git a/drivers/net/sfc/base/efx_rx.c b/drivers/net/sfc/base/efx_rx.c index 09933b41a..7b9f28664 100644 --- a/drivers/net/sfc/base/efx_rx.c +++ b/drivers/net/sfc/base/efx_rx.c @@ -299,5 +299,5 @@ efx_rx_scale_hash_flags_get( __in efx_nic_t *enp, __in efx_rx_hash_alg_t hash_alg, - __inout_ecount(EFX_RX_HASH_NFLAGS) unsigned int *flags, + __inout_ecount(EFX_RX_HASH_NFLAGS) unsigned int *flagsp, __out unsigned int *nflagsp) { @@ -305,8 +305,8 @@ efx_rx_scale_hash_flags_get( boolean_t l4; boolean_t additional_modes; - unsigned int *entryp = flags; + unsigned int *entryp = flagsp; efx_rc_t rc; - if (flags == NULL || nflagsp == NULL) { + if (flagsp == NULL || nflagsp == NULL) { rc = EINVAL; goto fail1; @@ -369,5 +369,5 @@ efx_rx_scale_hash_flags_get( #undef LIST_FLAGS - *nflagsp = (unsigned int)(entryp - flags); + *nflagsp = (unsigned int)(entryp - flagsp); EFSYS_ASSERT3U(*nflagsp, <=, EFX_RX_HASH_NFLAGS); -- 2.19.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2018-11-21 15:59:14.010150706 +0000 +++ 0015-net-sfc-base-fix-name-of-the-argument-to-store-RSS-f.patch 2018-11-21 15:59:13.000000000 +0000 @@ -1,14 +1,15 @@ -From e7feaba71c02418796afbe4356840e725ca6df6b Mon Sep 17 00:00:00 2001 +From 783dd59cf14af20497c4bff44f1ecfc6bcb52f2d Mon Sep 17 00:00:00 2001 From: Ivan Malov Date: Mon, 10 Sep 2018 10:33:27 +0100 Subject: [PATCH] net/sfc/base: fix name of the argument to store RSS flags +[ upstream commit e7feaba71c02418796afbe4356840e725ca6df6b ] + The function used to retrieve supported RSS flags has an argument which should be named properly to indicate that it's a pointer. Fixes: 613cbe75ae99 ("net/sfc/base: add a new means to control RSS hash") -Cc: stable@dpdk.org Signed-off-by: Ivan Malov Signed-off-by: Andrew Rybchenko @@ -18,10 +19,10 @@ 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/net/sfc/base/efx.h b/drivers/net/sfc/base/efx.h -index 0982a34d6..15b3882dd 100644 +index 53cbc9858..24fdd867d 100644 --- a/drivers/net/sfc/base/efx.h +++ b/drivers/net/sfc/base/efx.h -@@ -2369,5 +2369,5 @@ efx_rx_scale_hash_flags_get( +@@ -2225,5 +2225,5 @@ efx_rx_scale_hash_flags_get( __in efx_nic_t *enp, __in efx_rx_hash_alg_t hash_alg, - __inout_ecount(EFX_RX_HASH_NFLAGS) unsigned int *flags,