patch 'net/memif: remove unnecessary Rx interrupt stub' has been queued to stable release 19.11.12

[christian.ehrhardt at canonical.com]

Hi,

FYI, your patch has been queued to stable release 19.11.12

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/27/22. 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/cpaelzer/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/cpaelzer/dpdk-stable-queue/commit/c39fd98e6fab1bb19bce9dedfaa177fd020b0c19

Thanks.

Christian Ehrhardt <christian.ehrhardt at canonical.com>

---
>From c39fd98e6fab1bb19bce9dedfaa177fd020b0c19 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen at networkplumber.org>
Date: Fri, 14 Jan 2022 12:46:44 -0800
Subject: [PATCH] net/memif: remove unnecessary Rx interrupt stub
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[ upstream commit d6dccbd76692c64cff79a821bc73069dc5b043e4 ]

The code in memif driver to stub out rx_irq_enable is unnecessary
and causes different error returns than other drivers.
The core ethdev code will return -ENOTSUP if the driver has
a null rx_queue_intr_enable callback.

Fixes: 09c7e63a71f9 ("net/memif: introduce memory interface PMD")

Signed-off-by: Stephen Hemminger <stephen at networkplumber.org>
Acked-by: Morten Brørup <mb at smartsharesystems.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit at intel.com>
---
 drivers/net/memif/rte_eth_memif.c | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/drivers/net/memif/rte_eth_memif.c b/drivers/net/memif/rte_eth_memif.c
index 13758c6d9e..fddf84a8fd 100644
--- a/drivers/net/memif/rte_eth_memif.c
+++ b/drivers/net/memif/rte_eth_memif.c
@@ -1412,23 +1412,6 @@ memif_stats_reset(struct rte_eth_dev *dev)
 	return 0;
 }
 
-static int
-memif_rx_queue_intr_enable(struct rte_eth_dev *dev __rte_unused,
-			   uint16_t qid __rte_unused)
-{
-	MIF_LOG(WARNING, "Interrupt mode not supported.");
-
-	return -1;
-}
-
-static int
-memif_rx_queue_intr_disable(struct rte_eth_dev *dev, uint16_t qid __rte_unused)
-{
-	struct pmd_internals *pmd __rte_unused = dev->data->dev_private;
-
-	return 0;
-}
-
 static const struct eth_dev_ops ops = {
 	.dev_start = memif_dev_start,
 	.dev_close = memif_dev_close,
@@ -1438,8 +1421,6 @@ static const struct eth_dev_ops ops = {
 	.rx_queue_setup = memif_rx_queue_setup,
 	.rx_queue_release = memif_queue_release,
 	.tx_queue_release = memif_queue_release,
-	.rx_queue_intr_enable = memif_rx_queue_intr_enable,
-	.rx_queue_intr_disable = memif_rx_queue_intr_disable,
 	.link_update = memif_link_update,
 	.stats_get = memif_stats_get,
 	.stats_reset = memif_stats_reset,
-- 
2.35.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-02-25 16:58:45.172458366 +0100
+++ 0023-net-memif-remove-unnecessary-Rx-interrupt-stub.patch	2022-02-25 16:58:44.228990403 +0100
@@ -1 +1 @@
-From d6dccbd76692c64cff79a821bc73069dc5b043e4 Mon Sep 17 00:00:00 2001
+From c39fd98e6fab1bb19bce9dedfaa177fd020b0c19 Mon Sep 17 00:00:00 2001
@@ -8,0 +9,2 @@
+[ upstream commit d6dccbd76692c64cff79a821bc73069dc5b043e4 ]
+
@@ -15 +16,0 @@
-Cc: stable at dpdk.org
@@ -25 +26 @@
-index 59cb5a82a2..d3459c5007 100644
+index 13758c6d9e..fddf84a8fd 100644
@@ -28 +29 @@
-@@ -1500,23 +1500,6 @@ memif_stats_reset(struct rte_eth_dev *dev)
+@@ -1412,23 +1412,6 @@ memif_stats_reset(struct rte_eth_dev *dev)
@@ -51,2 +52,2 @@
- 	.dev_stop = memif_dev_stop,
-@@ -1527,8 +1510,6 @@ static const struct eth_dev_ops ops = {
+ 	.dev_close = memif_dev_close,
+@@ -1438,8 +1421,6 @@ static const struct eth_dev_ops ops = {
@@ -54,2 +55,2 @@
- 	.rx_queue_release = memif_rx_queue_release,
- 	.tx_queue_release = memif_tx_queue_release,
+ 	.rx_queue_release = memif_queue_release,
+ 	.tx_queue_release = memif_queue_release,