[dpdk-stable] patch 'net/sfc/base: fix Tx descriptor max number check' has been queued to LTS release 18.11.1

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.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 02/07/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.

Thanks.

Kevin Traynor

---
>From c778554d184f01acfd6aa2ec9fdae4ccdb0ac511 Mon Sep 17 00:00:00 2001
From: Igor Romanov <igor.romanov at oktetlabs.ru>
Date: Wed, 9 Jan 2019 11:12:07 +0000
Subject: [PATCH] net/sfc/base: fix Tx descriptor max number check

[ 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 <igor.romanov at oktetlabs.ru>
Signed-off-by: Andrew Rybchenko <arybchenko at solarflare.com>
---
 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 bf1180a1e..9fa9e2ed1 100644
--- a/drivers/net/sfc/base/efx_tx.c
+++ b/drivers/net/sfc/base/efx_tx.c
@@ -927,5 +927,6 @@ siena_tx_qcreate(
 
 	if (!ISP2(ndescs) ||
-	    (ndescs < EFX_TXQ_MINNDESCS) || (ndescs > EFX_EVQ_MAXNEVS)) {
+	    (ndescs < EFX_TXQ_MINNDESCS) ||
+	    (ndescs > encp->enc_txq_max_ndescs)) {
 		rc = EINVAL;
 		goto fail1;
-- 
2.19.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-01-31 15:44:06.676922460 +0000
+++ 0040-net-sfc-base-fix-Tx-descriptor-max-number-check.patch	2019-01-31 15:44:05.000000000 +0000
@@ -1,13 +1,14 @@
-From 31c2379bad4157ca0beb05c9d2b49395b68f373b Mon Sep 17 00:00:00 2001
+From c778554d184f01acfd6aa2ec9fdae4ccdb0ac511 Mon Sep 17 00:00:00 2001
 From: Igor Romanov <igor.romanov at oktetlabs.ru>
 Date: Wed, 9 Jan 2019 11:12:07 +0000
 Subject: [PATCH] net/sfc/base: fix Tx descriptor max number check
 
+[ 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")
-Cc: stable at dpdk.org
 
 Signed-off-by: Igor Romanov <igor.romanov at oktetlabs.ru>
 Signed-off-by: Andrew Rybchenko <arybchenko at solarflare.com>