net/bnxt: consolidate template table processing

[dpdk.git] / drivers / net / pcap / rte_eth_pcap.c

diff --git a/drivers/net/pcap/rte_eth_pcap.c b/drivers/net/pcap/rte_eth_pcap.c
index 13a3d0a..057aa9d 100644 (file)
--- a/drivers/net/pcap/rte_eth_pcap.c
+++ b/drivers/net/pcap/rte_eth_pcap.c
@@ -135,7 +135,7 @@ static struct rte_eth_link pmd_link = {
                .link_autoneg = ETH_LINK_FIXED,
 };
 
-static int eth_pcap_logtype;
+RTE_LOG_REGISTER(eth_pcap_logtype, pmd.net.pcap, NOTICE);
 
 #define PMD_LOG(level, fmt, args...) \
        rte_log(RTE_LOG_ ## level, eth_pcap_logtype, \
@@ -728,12 +728,20 @@ eth_stats_reset(struct rte_eth_dev *dev)
        return 0;
 }
 
-static void
+static int
 eth_dev_close(struct rte_eth_dev *dev)
 {
        unsigned int i;
        struct pmd_internals *internals = dev->data->dev_private;
 
+       PMD_LOG(INFO, "Closing pcap ethdev on NUMA socket %d",
+                       rte_socket_id());
+
+       rte_free(dev->process_private);
+
+       if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+               return 0;
+
        /* Device wide flag, but cleanup must be performed per queue. */
        if (internals->infinite_rx) {
                for (i = 0; i < dev->data->nb_rx_queues; i++) {
@@ -748,6 +756,11 @@ eth_dev_close(struct rte_eth_dev *dev)
                }
        }
 
+       if (internals->phy_mac == 0)
+               /* not dynamically allocated, must not be freed */
+               dev->data->mac_addrs = NULL;
+
+       return 0;
 }
 
 static void
@@ -1403,7 +1416,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 =
@@ -1543,30 +1557,16 @@ free_kvlist:
 static int
 pmd_pcap_remove(struct rte_vdev_device *dev)
 {
-       struct pmd_internals *internals = NULL;
        struct rte_eth_dev *eth_dev = NULL;
 
-       PMD_LOG(INFO, "Closing pcap ethdev on numa socket %d",
-                       rte_socket_id());
-
        if (!dev)
                return -1;
 
-       /* reserve an ethdev entry */
        eth_dev = rte_eth_dev_allocated(rte_vdev_device_name(dev));
        if (eth_dev == NULL)
-               return -1;
-
-       if (rte_eal_process_type() == RTE_PROC_PRIMARY) {
-               internals = eth_dev->data->dev_private;
-               if (internals != NULL && internals->phy_mac == 0)
-                       /* not dynamically allocated, must not be freed */
-                       eth_dev->data->mac_addrs = NULL;
-       }
+               return 0; /* port already released */
 
        eth_dev_close(eth_dev);
-
-       rte_free(eth_dev->process_private);
        rte_eth_dev_release_port(eth_dev);
 
        return 0;
@@ -1588,10 +1588,3 @@ RTE_PMD_REGISTER_PARAM_STRING(net_pcap,
        ETH_PCAP_IFACE_ARG "=<ifc> "
        ETH_PCAP_PHY_MAC_ARG "=<int>"
        ETH_PCAP_INFINITE_RX_ARG "=<0|1>");
-
-RTE_INIT(eth_pcap_init_log)
-{
-       eth_pcap_logtype = rte_log_register("pmd.net.pcap");
-       if (eth_pcap_logtype >= 0)
-               rte_log_set_level(eth_pcap_logtype, RTE_LOG_NOTICE);
-}