[spp] [PATCH 4/4] spp_pcap: fix trying to create ring already exist

[x-fn-spp at sl.ntt-tx.co.jp]

From: Hideyuki Yamashita <yamashita.hideyuki at po.ntt-tx.co.jp>

Same with "shared: fix trying to create ring already exist".

Signed-off-by: Hideyuki Yamashita <yamashita.hideyuki at po.ntt-tx.co.jp>
Signed-off-by: Naoki Takada <takada.naoki at lab.ntt.co.jp>
---
 src/pcap/spp_proc.c | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/pcap/spp_proc.c b/src/pcap/spp_proc.c
index ab08337..4e3b2c9 100644
--- a/src/pcap/spp_proc.c
+++ b/src/pcap/spp_proc.c
@@ -32,6 +32,8 @@ add_ring_pmd(int ring_id)
 {
 	struct rte_ring *ring;
 	int ring_port_id;
+	uint16_t port_id = PORT_RESET;
+	char dev_name[RTE_ETH_NAME_MAX_LEN];
 
 	/* Lookup ring of given id */
 	ring = rte_ring_lookup(get_rx_queue_name(ring_id));
@@ -42,7 +44,20 @@ add_ring_pmd(int ring_id)
 	}
 
 	/* Create ring pmd */
-	ring_port_id = rte_eth_from_ring(ring);
+	snprintf(dev_name, RTE_ETH_NAME_MAX_LEN - 1, "net_ring_%s", ring->name);
+	/* check whether a port already exists. */
+	ring_port_id = rte_eth_dev_get_port_by_name(dev_name, &port_id);
+	if (port_id == PORT_RESET) {
+		ring_port_id = rte_eth_from_ring(ring);
+		if (ring_port_id < 0) {
+			RTE_LOG(ERR, SPP_PROC, "Cannot create eth dev with "
+						"rte_eth_from_ring()\n");
+			return SPP_RET_NG;
+		}
+	} else {
+		ring_port_id = port_id;
+		rte_eth_dev_start(ring_port_id);
+	}
 	RTE_LOG(INFO, SPP_PROC, "ring port add. (no = %d / port = %d)\n",
 			ring_id, ring_port_id);
 	return ring_port_id;
-- 
2.17.1