All global variables in driver should use common prefix. Rename hwlock to ntnic_hwlock.
Signed-off-by: Stephen Hemminger <[email protected]> --- drivers/net/ntnic/include/stream_binary_flow_api.h | 2 +- drivers/net/ntnic/ntnic_ethdev.c | 14 +++++++------- drivers/net/ntnic/ntnic_filter/ntnic_filter.c | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/drivers/net/ntnic/include/stream_binary_flow_api.h b/drivers/net/ntnic/include/stream_binary_flow_api.h index 4ce1561033..b89f19d399 100644 --- a/drivers/net/ntnic/include/stream_binary_flow_api.h +++ b/drivers/net/ntnic/include/stream_binary_flow_api.h @@ -47,7 +47,7 @@ #define RAW_ENCAP_DECAP_ELEMS_MAX 16 extern uint64_t rte_tsc_freq; -extern rte_spinlock_t hwlock; +extern rte_spinlock_t ntnic_hwlock; /* * Flow eth dev profile determines how the FPGA module resources are diff --git a/drivers/net/ntnic/ntnic_ethdev.c b/drivers/net/ntnic/ntnic_ethdev.c index 67908e3807..9c9c91deca 100644 --- a/drivers/net/ntnic/ntnic_ethdev.c +++ b/drivers/net/ntnic/ntnic_ethdev.c @@ -92,7 +92,7 @@ static const struct rte_pci_id nthw_pci_id_map[] = { static const struct sg_ops_s *sg_ops; -rte_spinlock_t hwlock = RTE_SPINLOCK_INITIALIZER; +rte_spinlock_t ntnic_hwlock = RTE_SPINLOCK_INITIALIZER; /* * Store and get adapter info @@ -124,9 +124,9 @@ store_pdrv(struct drv_s *p_drv) PCIIDENT_TO_FUNCNR(p_drv->ntdrv.pciident)); } - rte_spinlock_lock(&hwlock); + rte_spinlock_lock(&ntnic_hwlock); _g_p_drv[p_drv->adapter_no] = p_drv; - rte_spinlock_unlock(&hwlock); + rte_spinlock_unlock(&ntnic_hwlock); } static void clear_pdrv(struct drv_s *p_drv) @@ -134,9 +134,9 @@ static void clear_pdrv(struct drv_s *p_drv) if (p_drv->adapter_no >= NUM_ADAPTER_MAX) return; - rte_spinlock_lock(&hwlock); + rte_spinlock_lock(&ntnic_hwlock); _g_p_drv[p_drv->adapter_no] = NULL; - rte_spinlock_unlock(&hwlock); + rte_spinlock_unlock(&ntnic_hwlock); } static struct drv_s * @@ -144,7 +144,7 @@ get_pdrv_from_pci(struct rte_pci_addr addr) { int i; struct drv_s *p_drv = NULL; - rte_spinlock_lock(&hwlock); + rte_spinlock_lock(&ntnic_hwlock); for (i = 0; i < NUM_ADAPTER_MAX; i++) { if (_g_p_drv[i]) { @@ -156,7 +156,7 @@ get_pdrv_from_pci(struct rte_pci_addr addr) } } - rte_spinlock_unlock(&hwlock); + rte_spinlock_unlock(&ntnic_hwlock); return p_drv; } diff --git a/drivers/net/ntnic/ntnic_filter/ntnic_filter.c b/drivers/net/ntnic/ntnic_filter/ntnic_filter.c index 813ac04481..b68838461d 100644 --- a/drivers/net/ntnic/ntnic_filter/ntnic_filter.c +++ b/drivers/net/ntnic/ntnic_filter/ntnic_filter.c @@ -1187,7 +1187,7 @@ static int poll_statistics(struct pmd_internals *internals) RTE_ASSERT(rte_tsc_freq > 0); - rte_spinlock_lock(&hwlock); + rte_spinlock_lock(&ntnic_hwlock); uint64_t now_rtc = rte_get_tsc_cycles(); @@ -1196,7 +1196,7 @@ static int poll_statistics(struct pmd_internals *internals) * if more than a second since last stat read, do a new one */ if ((now_rtc - internals->last_stat_rtc) < rte_tsc_freq) { - rte_spinlock_unlock(&hwlock); + rte_spinlock_unlock(&ntnic_hwlock); return 0; } @@ -1242,7 +1242,7 @@ static int poll_statistics(struct pmd_internals *internals) /* Globally only once a second */ if ((now_rtc - last_stat_rtc) < rte_tsc_freq) { - rte_spinlock_unlock(&hwlock); + rte_spinlock_unlock(&ntnic_hwlock); rte_spinlock_unlock(&p_nt_drv->stat_lck); return 0; } @@ -1279,7 +1279,7 @@ static int poll_statistics(struct pmd_internals *internals) } } - rte_spinlock_unlock(&hwlock); + rte_spinlock_unlock(&ntnic_hwlock); rte_spinlock_unlock(&p_nt_drv->stat_lck); return 0; -- 2.47.3
