git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net/sfc: implement EF10 native Tx datapath
[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
7253b9a
..
075e3be
100644
(file)
--- a/
drivers/net/pcap/rte_eth_pcap.c
+++ b/
drivers/net/pcap/rte_eth_pcap.c
@@
-119,7
+119,6
@@
static struct ether_addr eth_addr = {
.addr_bytes = { 0, 0, 0, 0x1, 0x2, 0x3 }
};
.addr_bytes = { 0, 0, 0, 0x1, 0x2, 0x3 }
};
-static const char *drivername = "Pcap PMD";
static struct rte_eth_link pmd_link = {
.link_speed = ETH_SPEED_NUM_10G,
.link_duplex = ETH_LINK_FULL_DUPLEX,
static struct rte_eth_link pmd_link = {
.link_speed = ETH_SPEED_NUM_10G,
.link_duplex = ETH_LINK_FULL_DUPLEX,
@@
-247,7
+246,7
@@
calculate_timestamp(struct timeval *ts) {
cycles = rte_get_timer_cycles() - start_cycles;
cur_time.tv_sec = cycles / hz;
cycles = rte_get_timer_cycles() - start_cycles;
cur_time.tv_sec = cycles / hz;
- cur_time.tv_usec = (cycles % hz) * 1
0
e6 / hz;
+ cur_time.tv_usec = (cycles % hz) * 1e6 / hz;
timeradd(&start_time, &cur_time, ts);
}
timeradd(&start_time, &cur_time, ts);
}
@@
-294,9
+293,9
@@
eth_pcap_tx_dumper(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)
}
}
}
}
- rte_pktmbuf_free(mbuf);
num_tx++;
tx_bytes += mbuf->pkt_len;
num_tx++;
tx_bytes += mbuf->pkt_len;
+ rte_pktmbuf_free(mbuf);
}
/*
}
/*
@@
-552,7
+551,6
@@
eth_dev_info(struct rte_eth_dev *dev,
{
struct pmd_internals *internals = dev->data->dev_private;
{
struct pmd_internals *internals = dev->data->dev_private;
- dev_info->driver_name = drivername;
dev_info->if_index = internals->if_index;
dev_info->max_mac_addrs = 1;
dev_info->max_rx_pktlen = (uint32_t) -1;
dev_info->if_index = internals->if_index;
dev_info->max_mac_addrs = 1;
dev_info->max_rx_pktlen = (uint32_t) -1;
@@
-789,6
+787,8
@@
open_tx_iface(const char *key, const char *value, void *extra_args)
return 0;
}
return 0;
}
+static struct rte_vdev_driver pmd_pcap_drv;
+
static int
pmd_init_internals(const char *name, const unsigned int nb_rx_queues,
const unsigned int nb_tx_queues,
static int
pmd_init_internals(const char *name, const unsigned int nb_rx_queues,
const unsigned int nb_tx_queues,
@@
-841,7
+841,7
@@
pmd_init_internals(const char *name, const unsigned int nb_rx_queues,
(*eth_dev)->driver = NULL;
data->dev_flags = RTE_ETH_DEV_DETACHABLE;
data->kdrv = RTE_KDRV_NONE;
(*eth_dev)->driver = NULL;
data->dev_flags = RTE_ETH_DEV_DETACHABLE;
data->kdrv = RTE_KDRV_NONE;
- data->drv_name =
driver
name;
+ data->drv_name =
pmd_pcap_drv.driver.
name;
data->numa_node = numa_node;
return 0;
data->numa_node = numa_node;
return 0;