RE: [PATCH 06/12] net/pcap: remove global variables

Marat Khalili
2026-01-07T09:48:13Z

> -----Original Message-----
> From: Stephen Hemminger <stephen@networkplumber.org>
> Sent: Tuesday 6 January 2026 18:27
> To: dev@dpdk.org
> Cc: Stephen Hemminger <stephen@networkplumber.org>
> Subject: [PATCH 06/12] net/pcap: remove global variables
>
> Localize variables where possible.
>
> Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
> ---
> drivers/net/pcap/pcap_ethdev.c | 8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/pcap/pcap_ethdev.c b/drivers/net/pcap/pcap_ethdev.c
> index 905ca62bd4..1658685a28 100644
> --- a/drivers/net/pcap/pcap_ethdev.c
> +++ b/drivers/net/pcap/pcap_ethdev.c
> @@ -39,11 +39,9 @@
>
> #define RTE_PMD_PCAP_MAX_QUEUES 16
>
> -static char errbuf[PCAP_ERRBUF_SIZE];
> static struct timespec start_time;
> static uint64_t start_cycles;
> static uint64_t hz;
> -static uint8_t iface_idx;
>
> static uint64_t timestamp_rx_dynflag;
> static int timestamp_dynfield_offset = -1;
> @@ -526,6 +524,8 @@ eth_pcap_tx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)
> static inline int
> open_iface_live(const char *iface, pcap_t **pcap)
> {
> + char errbuf[PCAP_ERRBUF_SIZE];
> +
> pcap_t *pc = pcap_create(iface, errbuf);
> if (pc == NULL) {
> PMD_LOG(ERR, "Couldn't create %s: %s", iface, errbuf);
> @@ -621,6 +621,8 @@ open_single_tx_pcap(const char *pcap_filename, pcap_dumper_t **dumper)
> static int
> open_single_rx_pcap(const char *pcap_filename, pcap_t **pcap)
> {
> + char errbuf[PCAP_ERRBUF_SIZE];
> +
> *pcap = pcap_open_offline_with_tstamp_precision(pcap_filename,
> PCAP_TSTAMP_PRECISION_NANO, errbuf);
> if (*pcap == NULL) {
> @@ -1314,11 +1316,13 @@ pmd_init_internals(struct rte_vdev_device *vdev,
> * - and point eth_dev structure to new eth_dev_data structure
> */
> *internals = (*eth_dev)->data->dev_private;
> +
> /*
> * Interface MAC = 02:70:63:61:70:<iface_idx>
> * derived from: 'locally administered':'p':'c':'a':'p':'iface_idx'
> * where the middle 4 characters are converted to hex.
> */
> + static uint8_t iface_idx;
> (*internals)->eth_addr = (struct rte_ether_addr) {
> .addr_bytes = { 0x02, 0x70, 0x63, 0x61, 0x70, iface_idx++ }
> };
> --
> 2.51.0

Acked-by: Marat Khalili <marat.khalili@huawei.com>