[dpdk-stable] patch 'net/pcap: fix input only Rx' has been queued to stable release 19.11.6

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.6

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 10/30/20. 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.

Luca Boccassi

---
>From 4189755e31b57644393e33f306c7676bafa672b6 Mon Sep 17 00:00:00 2001
From: Ferruh Yigit <ferruh.yigit at intel.com>
Date: Thu, 8 Oct 2020 12:34:25 +0100
Subject: [PATCH] net/pcap: fix input only Rx

[ upstream commit 113a461e82d3abe450da1daa21deebdea218532b ]

When input only Rx interface argument 'rx_iface_in' provided, current
code assigns 'eth_null_rx' burst function by mistake and no packet
received as a result.
Like in following usage no packets received from physical interface:
"--vdev net_pcap0,rx_iface_in=eth0,tx_iface=eth0"

Fixing the burst function assignment when 'rx_iface_in' argument is used

Fixes: f14a94591504 ("net/pcap: remove Rx queue argument necessity")

Reported-by: Muthurajan Jayakumar <muthurajan.jayakumar at intel.com>
Signed-off-by: Ferruh Yigit <ferruh.yigit at intel.com>
---
 drivers/net/pcap/rte_eth_pcap.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/net/pcap/rte_eth_pcap.c b/drivers/net/pcap/rte_eth_pcap.c
index aa7ef6fdbc..6fb26c8c9d 100644
--- a/drivers/net/pcap/rte_eth_pcap.c
+++ b/drivers/net/pcap/rte_eth_pcap.c
@@ -1398,7 +1398,8 @@ pmd_pcap_probe(struct rte_vdev_device *dev)
 	devargs_all.is_rx_pcap =
 		rte_kvargs_count(kvlist, ETH_PCAP_RX_PCAP_ARG) ? 1 : 0;
 	devargs_all.is_rx_iface =
-		rte_kvargs_count(kvlist, ETH_PCAP_RX_IFACE_ARG) ? 1 : 0;
+		(rte_kvargs_count(kvlist, ETH_PCAP_RX_IFACE_ARG) +
+		 rte_kvargs_count(kvlist, ETH_PCAP_RX_IFACE_IN_ARG)) ? 1 : 0;
 	pcaps.num_of_queue = 0;
 
 	devargs_all.is_tx_pcap =
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-10-28 10:35:16.911486178 +0000
+++ 0167-net-pcap-fix-input-only-Rx.patch	2020-10-28 10:35:11.772833968 +0000
@@ -1,8 +1,10 @@
-From 113a461e82d3abe450da1daa21deebdea218532b Mon Sep 17 00:00:00 2001
+From 4189755e31b57644393e33f306c7676bafa672b6 Mon Sep 17 00:00:00 2001
 From: Ferruh Yigit <ferruh.yigit at intel.com>
 Date: Thu, 8 Oct 2020 12:34:25 +0100
 Subject: [PATCH] net/pcap: fix input only Rx
 
+[ upstream commit 113a461e82d3abe450da1daa21deebdea218532b ]
+
 When input only Rx interface argument 'rx_iface_in' provided, current
 code assigns 'eth_null_rx' burst function by mistake and no packet
 received as a result.
@@ -12,7 +14,6 @@
 Fixing the burst function assignment when 'rx_iface_in' argument is used
 
 Fixes: f14a94591504 ("net/pcap: remove Rx queue argument necessity")
-Cc: stable at dpdk.org
 
 Reported-by: Muthurajan Jayakumar <muthurajan.jayakumar at intel.com>
 Signed-off-by: Ferruh Yigit <ferruh.yigit at intel.com>
@@ -21,10 +22,10 @@
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/net/pcap/rte_eth_pcap.c b/drivers/net/pcap/rte_eth_pcap.c
-index da4988064a..057aa9dbfc 100644
+index aa7ef6fdbc..6fb26c8c9d 100644
 --- a/drivers/net/pcap/rte_eth_pcap.c
 +++ b/drivers/net/pcap/rte_eth_pcap.c
-@@ -1416,7 +1416,8 @@ pmd_pcap_probe(struct rte_vdev_device *dev)
+@@ -1398,7 +1398,8 @@ pmd_pcap_probe(struct rte_vdev_device *dev)
  	devargs_all.is_rx_pcap =
  		rte_kvargs_count(kvlist, ETH_PCAP_RX_PCAP_ARG) ? 1 : 0;
  	devargs_all.is_rx_iface =