net/ionic: set port admin state to up in port init

[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 4e6d493..a32b1f3 100644 (file)
--- a/drivers/net/pcap/rte_eth_pcap.c
+++ b/drivers/net/pcap/rte_eth_pcap.c
@@ -661,15 +661,6 @@ status_down:
 static int
 eth_dev_configure(struct rte_eth_dev *dev __rte_unused)
 {
-       int ret;
-
-       ret = rte_mbuf_dyn_rx_timestamp_register(&timestamp_dynfield_offset,
-                       &timestamp_rx_dynflag);
-       if (ret != 0) {
-               PMD_LOG(ERR, "Failed to register Rx timestamp field/flag");
-               return -rte_errno;
-       }
-
        return 0;
 }
 
@@ -1333,9 +1324,8 @@ eth_from_pcaps(struct rte_vdev_device *vdev,
 
                /* phy_mac arg is applied only only if "iface" devarg is provided */
                if (rx_queues->phy_mac) {
-                       int ret = eth_pcap_update_mac(rx_queues->queue[0].name,
-                                       eth_dev, vdev->device.numa_node);
-                       if (ret == 0)
+                       if (eth_pcap_update_mac(rx_queues->queue[0].name,
+                                       eth_dev, vdev->device.numa_node) == 0)
                                internals->phy_mac = 1;
                }
        }
@@ -1387,6 +1377,13 @@ pmd_pcap_probe(struct rte_vdev_device *dev)
        start_cycles = rte_get_timer_cycles();
        hz = rte_get_timer_hz();
 
+       ret = rte_mbuf_dyn_rx_timestamp_register(&timestamp_dynfield_offset,
+                       &timestamp_rx_dynflag);
+       if (ret != 0) {
+               PMD_LOG(ERR, "Failed to register Rx timestamp field/flag");
+               return -1;
+       }
+
        if (rte_eal_process_type() == RTE_PROC_SECONDARY) {
                eth_dev = rte_eth_dev_attach_secondary(name);
                if (!eth_dev) {