From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dispatch1-us1.ppe-hosted.com (dispatch1-us1.ppe-hosted.com [148.163.129.52]) by dpdk.org (Postfix) with ESMTP id 109A949E0 for ; Mon, 11 Mar 2019 09:44:36 +0100 (CET) X-Virus-Scanned: Proofpoint Essentials engine Received: from webmail.solarflare.com (webmail.solarflare.com [12.187.104.26]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mx1-us2.ppe-hosted.com (Proofpoint Essentials ESMTP Server) with ESMTPS id 5E05B680055; Mon, 11 Mar 2019 08:44:35 +0000 (UTC) Received: from ocex03.SolarFlarecom.com (10.20.40.36) by ocex03.SolarFlarecom.com (10.20.40.36) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Mon, 11 Mar 2019 01:44:31 -0700 Received: from opal.uk.solarflarecom.com (10.17.10.1) by ocex03.SolarFlarecom.com (10.20.40.36) with Microsoft SMTP Server (TLS) id 15.0.1395.4 via Frontend Transport; Mon, 11 Mar 2019 01:44:31 -0700 Received: from ukv-loginhost.uk.solarflarecom.com (ukv-loginhost.uk.solarflarecom.com [10.17.10.39]) by opal.uk.solarflarecom.com (8.13.8/8.13.8) with ESMTP id x2B8iUqY031013; Mon, 11 Mar 2019 08:44:30 GMT Received: from ukv-loginhost.uk.solarflarecom.com (localhost [127.0.0.1]) by ukv-loginhost.uk.solarflarecom.com (Postfix) with ESMTP id 24B8A1626ED; Mon, 11 Mar 2019 08:44:30 +0000 (GMT) From: Andrew Rybchenko To: CC: Igor Romanov Date: Mon, 11 Mar 2019 08:44:15 +0000 Message-ID: <1552293856-24222-2-git-send-email-arybchenko@solarflare.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1552293856-24222-1-git-send-email-arybchenko@solarflare.com> References: <1552293856-24222-1-git-send-email-arybchenko@solarflare.com> MIME-Version: 1.0 Content-Type: text/plain X-TM-AS-Product-Ver: SMEX-12.5.0.1300-8.5.1010-24482.005 X-TM-AS-Result: No-3.583900-4.000000-10 X-TMASE-MatchedRID: qT9V7Qri989rtoObOqfJT0hwlOfYeSqxpfVcx39Kq+4AhmnHHeGnvbNg xlr0XT/3IV4u8YKdeKsBtjkcfRMmqZH0YXYnbGozFEUknJ/kEl7dB/CxWTRRu/558CedkGIvkrX fN5BwqVFb4jx5SCnZgsQNPu8xXAAy/LN+N3HJwkoPhNKgSBDu0tcasw2fjcKg8B14Be5rcI+YPH 7s5kMzax3MQbgj3UKC5zobdbVXHQ6TdSRXlCnjBIjjlF305EnAWUm8SESyzd/NBqGt1DPvvA== X-TM-AS-User-Approved-Sender: No X-TM-AS-User-Blocked-Sender: No X-TMASE-Result: 10--3.583900-4.000000 X-TMASE-Version: SMEX-12.5.0.1300-8.5.1010-24482.005 X-MDID: 1552293876-QOLW4-EMVdzm Subject: [dpdk-stable] [PATCH 17.11] net/sfc/base: fix Tx descriptor max number check 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: Mon, 11 Mar 2019 08:44:37 -0000 From: Igor Romanov [ backported from upstream commit 31c2379bad4157ca0beb05c9d2b49395b68f373b ] Fix check of maximum descriptor number (compare with maximum Tx descriptor number instead of maximum EVQ events number). Fixes: f7dc06bf35f2 ("net/sfc/base: import 5xxx/6xxx family support") Signed-off-by: Igor Romanov Signed-off-by: Andrew Rybchenko --- drivers/net/sfc/base/efx_tx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/sfc/base/efx_tx.c b/drivers/net/sfc/base/efx_tx.c index ceb2920..ee0ec9f 100644 --- a/drivers/net/sfc/base/efx_tx.c +++ b/drivers/net/sfc/base/efx_tx.c @@ -910,7 +910,8 @@ EFSYS_ASSERT(ISP2(encp->enc_txq_max_ndescs)); EFX_STATIC_ASSERT(ISP2(EFX_TXQ_MINNDESCS)); - if (!ISP2(n) || (n < EFX_TXQ_MINNDESCS) || (n > EFX_EVQ_MAXNEVS)) { + if (!ISP2(n) || + (n < EFX_TXQ_MINNDESCS) || (n > encp->enc_txq_max_ndescs)) { rc = EINVAL; goto fail1; } -- 1.8.3.1