Use the new rte_bsd_queue.h where needed but most files already get the needed macros from rte_tailq.h
Signed-off-by: Stephen Hemminger <step...@networkplumber.org> --- lib/acl/rte_acl_osdep.h | 1 - lib/bbdev/rte_bbdev.c | 2 +- lib/bpf/bpf_load_elf.c | 1 - lib/bpf/bpf_pkt.c | 3 +-- lib/cryptodev/cryptodev_pmd.c | 1 - lib/cryptodev/rte_cryptodev.c | 1 - lib/distributor/rte_distributor.c | 2 +- lib/distributor/rte_distributor_single.c | 2 +- lib/efd/rte_efd.c | 1 - lib/fib/rte_fib.c | 1 - lib/fib/rte_fib6.c | 1 - lib/gpudev/gpudev_driver.h | 1 - lib/graph/graph_private.h | 1 - lib/hash/rte_cuckoo_hash.c | 1 - lib/hash/rte_fbk_hash.c | 1 - lib/hash/rte_thash.c | 1 - lib/ip_frag/ip_frag_common.h | 3 +-- lib/log/log.c | 2 +- lib/lpm/rte_lpm.c | 1 - lib/lpm/rte_lpm6.c | 1 - lib/mbuf/rte_mbuf_dyn.c | 1 - lib/mempool/rte_mempool.c | 1 - lib/mempool/rte_mempool.h | 1 + lib/pipeline/rte_swx_ctl.c | 1 - lib/pipeline/rte_swx_pipeline_internal.h | 3 ++- lib/pmu/pmu.c | 1 - lib/reorder/rte_reorder.c | 1 - lib/rib/rte_rib.c | 1 - lib/rib/rte_rib6.c | 1 - lib/ring/rte_ring.c | 1 - lib/stack/rte_stack.c | 1 - lib/vhost/fd_man.h | 1 - lib/vhost/socket.c | 2 +- lib/vhost/vdpa.c | 2 -- lib/vhost/vhost.h | 2 +- 35 files changed, 11 insertions(+), 37 deletions(-) diff --git a/lib/acl/rte_acl_osdep.h b/lib/acl/rte_acl_osdep.h index b2c262dee7..96e4f2908c 100644 --- a/lib/acl/rte_acl_osdep.h +++ b/lib/acl/rte_acl_osdep.h @@ -21,7 +21,6 @@ #include <stdio.h> #include <stdarg.h> #include <stdlib.h> -#include <sys/queue.h> /* * Common defines. diff --git a/lib/bbdev/rte_bbdev.c b/lib/bbdev/rte_bbdev.c index e0f8c8eb0d..8ef1c84f71 100644 --- a/lib/bbdev/rte_bbdev.c +++ b/lib/bbdev/rte_bbdev.c @@ -5,8 +5,8 @@ #include <stdint.h> #include <string.h> #include <stdbool.h> -#include <sys/queue.h> +#include <rte_bsd_queue.h> #include <eal_export.h> #include <rte_common.h> #include <rte_errno.h> diff --git a/lib/bpf/bpf_load_elf.c b/lib/bpf/bpf_load_elf.c index 1d30ba17e2..4e911c5083 100644 --- a/lib/bpf/bpf_load_elf.c +++ b/lib/bpf/bpf_load_elf.c @@ -12,7 +12,6 @@ #include <sys/types.h> #include <sys/stat.h> -#include <sys/queue.h> #include <fcntl.h> #include <libelf.h> diff --git a/lib/bpf/bpf_pkt.c b/lib/bpf/bpf_pkt.c index 01f813c56b..e3cd56f961 100644 --- a/lib/bpf/bpf_pkt.c +++ b/lib/bpf/bpf_pkt.c @@ -7,8 +7,7 @@ #include <errno.h> #include <stdint.h> -#include <sys/queue.h> - +#include <rte_bsd_queue.h> #include <eal_export.h> #include <rte_common.h> #include <rte_malloc.h> diff --git a/lib/cryptodev/cryptodev_pmd.c b/lib/cryptodev/cryptodev_pmd.c index d79d561bf6..1c6292ed1c 100644 --- a/lib/cryptodev/cryptodev_pmd.c +++ b/lib/cryptodev/cryptodev_pmd.c @@ -3,7 +3,6 @@ */ #include <stdlib.h> -#include <sys/queue.h> #include <dev_driver.h> #include <eal_export.h> diff --git a/lib/cryptodev/rte_cryptodev.c b/lib/cryptodev/rte_cryptodev.c index bb7bab4dd5..833f809c03 100644 --- a/lib/cryptodev/rte_cryptodev.c +++ b/lib/cryptodev/rte_cryptodev.c @@ -2,7 +2,6 @@ * Copyright(c) 2015-2020 Intel Corporation */ -#include <sys/queue.h> #include <ctype.h> #include <stdio.h> #include <stdlib.h> diff --git a/lib/distributor/rte_distributor.c b/lib/distributor/rte_distributor.c index dde7ce2677..49ce882cdb 100644 --- a/lib/distributor/rte_distributor.c +++ b/lib/distributor/rte_distributor.c @@ -5,8 +5,8 @@ #include <stdalign.h> #include <stdio.h> #include <stdlib.h> -#include <sys/queue.h> #include <string.h> + #include <eal_export.h> #include <rte_mbuf.h> #include <rte_cycles.h> diff --git a/lib/distributor/rte_distributor_single.c b/lib/distributor/rte_distributor_single.c index d4b3e12648..804d6b8a71 100644 --- a/lib/distributor/rte_distributor_single.c +++ b/lib/distributor/rte_distributor_single.c @@ -3,7 +3,7 @@ */ #include <stdio.h> -#include <sys/queue.h> + #include <rte_mbuf.h> #include <rte_memzone.h> #include <rte_errno.h> diff --git a/lib/efd/rte_efd.c b/lib/efd/rte_efd.c index b0e44e5c51..d7abdda303 100644 --- a/lib/efd/rte_efd.c +++ b/lib/efd/rte_efd.c @@ -7,7 +7,6 @@ #include <stdlib.h> #include <inttypes.h> #include <errno.h> -#include <sys/queue.h> #include <eal_export.h> #include <rte_cpuflags.h> diff --git a/lib/fib/rte_fib.c b/lib/fib/rte_fib.c index 184210f380..e3da524236 100644 --- a/lib/fib/rte_fib.c +++ b/lib/fib/rte_fib.c @@ -5,7 +5,6 @@ #include <stdint.h> #include <string.h> -#include <sys/queue.h> #include <eal_export.h> #include <rte_eal_memconfig.h> diff --git a/lib/fib/rte_fib6.c b/lib/fib/rte_fib6.c index 93a1c7197b..b351d8cd69 100644 --- a/lib/fib/rte_fib6.c +++ b/lib/fib/rte_fib6.c @@ -5,7 +5,6 @@ #include <stdint.h> #include <string.h> -#include <sys/queue.h> #include <eal_export.h> #include <rte_eal_memconfig.h> diff --git a/lib/gpudev/gpudev_driver.h b/lib/gpudev/gpudev_driver.h index 37b6ae3149..6478814fce 100644 --- a/lib/gpudev/gpudev_driver.h +++ b/lib/gpudev/gpudev_driver.h @@ -12,7 +12,6 @@ #define RTE_GPUDEV_DRIVER_H #include <stdint.h> -#include <sys/queue.h> #include <dev_driver.h> diff --git a/lib/graph/graph_private.h b/lib/graph/graph_private.h index 21912c0ae6..db74ff41d2 100644 --- a/lib/graph/graph_private.h +++ b/lib/graph/graph_private.h @@ -6,7 +6,6 @@ #define _RTE_GRAPH_PRIVATE_H_ #include <inttypes.h> -#include <sys/queue.h> #include <rte_common.h> #include <rte_eal.h> diff --git a/lib/hash/rte_cuckoo_hash.c b/lib/hash/rte_cuckoo_hash.c index 2c92c51624..dbc0ddcf75 100644 --- a/lib/hash/rte_cuckoo_hash.c +++ b/lib/hash/rte_cuckoo_hash.c @@ -7,7 +7,6 @@ #include <stdint.h> #include <errno.h> #include <stdio.h> -#include <sys/queue.h> #include <eal_export.h> #include <rte_common.h> diff --git a/lib/hash/rte_fbk_hash.c b/lib/hash/rte_fbk_hash.c index 38b15a14d1..c4027bee26 100644 --- a/lib/hash/rte_fbk_hash.c +++ b/lib/hash/rte_fbk_hash.c @@ -6,7 +6,6 @@ #include <stdio.h> #include <string.h> #include <errno.h> -#include <sys/queue.h> #include <eal_export.h> #include <rte_cpuflags.h> diff --git a/lib/hash/rte_thash.c b/lib/hash/rte_thash.c index 6c662bf14f..63930f67be 100644 --- a/lib/hash/rte_thash.c +++ b/lib/hash/rte_thash.c @@ -3,7 +3,6 @@ */ #include <stdalign.h> -#include <sys/queue.h> #include <eal_export.h> #include <rte_thash.h> diff --git a/lib/ip_frag/ip_frag_common.h b/lib/ip_frag/ip_frag_common.h index 51fc9d47fb..ecf29fc02b 100644 --- a/lib/ip_frag/ip_frag_common.h +++ b/lib/ip_frag/ip_frag_common.h @@ -5,8 +5,7 @@ #ifndef _IP_FRAG_COMMON_H_ #define _IP_FRAG_COMMON_H_ -#include <sys/queue.h> - +#include <rte_bsd_queue.h> #include <rte_common.h> #if defined(RTE_ARCH_ARM64) diff --git a/lib/log/log.c b/lib/log/log.c index 8ad5250a13..b785156bac 100644 --- a/lib/log/log.c +++ b/lib/log/log.c @@ -11,9 +11,9 @@ #include <errno.h> #include <regex.h> #include <fnmatch.h> -#include <sys/queue.h> #include <unistd.h> +#include <rte_bsd_queue.h> #include <eal_export.h> #include <rte_common.h> #include <rte_log.h> diff --git a/lib/lpm/rte_lpm.c b/lib/lpm/rte_lpm.c index 6dab86a05e..09d1e08263 100644 --- a/lib/lpm/rte_lpm.c +++ b/lib/lpm/rte_lpm.c @@ -7,7 +7,6 @@ #include <stdint.h> #include <errno.h> #include <stdio.h> -#include <sys/queue.h> #include <eal_export.h> #include <rte_log.h> diff --git a/lib/lpm/rte_lpm6.c b/lib/lpm/rte_lpm6.c index e23c886766..781ec8de0b 100644 --- a/lib/lpm/rte_lpm6.c +++ b/lib/lpm/rte_lpm6.c @@ -6,7 +6,6 @@ #include <stdint.h> #include <errno.h> #include <stdio.h> -#include <sys/queue.h> #include <eal_export.h> #include <rte_log.h> diff --git a/lib/mbuf/rte_mbuf_dyn.c b/lib/mbuf/rte_mbuf_dyn.c index 5987c9dee8..9a20033021 100644 --- a/lib/mbuf/rte_mbuf_dyn.c +++ b/lib/mbuf/rte_mbuf_dyn.c @@ -3,7 +3,6 @@ */ #include <stdalign.h> -#include <sys/queue.h> #include <stdint.h> #include <limits.h> diff --git a/lib/mempool/rte_mempool.c b/lib/mempool/rte_mempool.c index 1021ede0c2..bf8e870151 100644 --- a/lib/mempool/rte_mempool.c +++ b/lib/mempool/rte_mempool.c @@ -12,7 +12,6 @@ #include <unistd.h> #include <inttypes.h> #include <errno.h> -#include <sys/queue.h> #include <eal_export.h> #include <rte_common.h> diff --git a/lib/mempool/rte_mempool.h b/lib/mempool/rte_mempool.h index aedc100964..e5492a9ce0 100644 --- a/lib/mempool/rte_mempool.h +++ b/lib/mempool/rte_mempool.h @@ -49,6 +49,7 @@ #include <rte_ring.h> #include <rte_memcpy.h> #include <rte_common.h> +#include <rte_tailq.h> #include "rte_mempool_trace_fp.h" diff --git a/lib/pipeline/rte_swx_ctl.c b/lib/pipeline/rte_swx_ctl.c index 4e9bb842a1..ca44adb126 100644 --- a/lib/pipeline/rte_swx_ctl.c +++ b/lib/pipeline/rte_swx_ctl.c @@ -5,7 +5,6 @@ #include <stdlib.h> #include <string.h> #include <stdio.h> -#include <sys/queue.h> #include <unistd.h> #include <eal_export.h> diff --git a/lib/pipeline/rte_swx_pipeline_internal.h b/lib/pipeline/rte_swx_pipeline_internal.h index df864ea066..fa8dfa7d75 100644 --- a/lib/pipeline/rte_swx_pipeline_internal.h +++ b/lib/pipeline/rte_swx_pipeline_internal.h @@ -6,7 +6,7 @@ #include <inttypes.h> #include <string.h> -#include <sys/queue.h> + #include <rte_bitops.h> #include <rte_byteorder.h> @@ -14,6 +14,7 @@ #include <rte_cycles.h> #include <rte_prefetch.h> #include <rte_meter.h> +#include <rte_tailq.h> #include <rte_swx_table_selector.h> #include <rte_swx_table_learner.h> diff --git a/lib/pmu/pmu.c b/lib/pmu/pmu.c index 4c7271522a..6a18563c80 100644 --- a/lib/pmu/pmu.c +++ b/lib/pmu/pmu.c @@ -8,7 +8,6 @@ #include <stdlib.h> #include <unistd.h> #include <sys/mman.h> -#include <sys/queue.h> #include <sys/ioctl.h> #include <sys/syscall.h> diff --git a/lib/reorder/rte_reorder.c b/lib/reorder/rte_reorder.c index be06530860..1c4751bee0 100644 --- a/lib/reorder/rte_reorder.c +++ b/lib/reorder/rte_reorder.c @@ -4,7 +4,6 @@ #include <stdalign.h> #include <string.h> -#include <sys/queue.h> #include <eal_export.h> #include <rte_string_fns.h> diff --git a/lib/rib/rte_rib.c b/lib/rib/rte_rib.c index 046db131ca..bfb4c0e577 100644 --- a/lib/rib/rte_rib.c +++ b/lib/rib/rte_rib.c @@ -5,7 +5,6 @@ #include <stdbool.h> #include <stdint.h> -#include <sys/queue.h> #include <eal_export.h> #include <rte_eal_memconfig.h> diff --git a/lib/rib/rte_rib6.c b/lib/rib/rte_rib6.c index ded5fd044f..1efe19e97c 100644 --- a/lib/rib/rte_rib6.c +++ b/lib/rib/rte_rib6.c @@ -5,7 +5,6 @@ #include <stdbool.h> #include <stdint.h> -#include <sys/queue.h> #include <eal_export.h> #include <rte_eal_memconfig.h> diff --git a/lib/ring/rte_ring.c b/lib/ring/rte_ring.c index edd63aa535..b63820dcd2 100644 --- a/lib/ring/rte_ring.c +++ b/lib/ring/rte_ring.c @@ -13,7 +13,6 @@ #include <stdint.h> #include <inttypes.h> #include <errno.h> -#include <sys/queue.h> #include <eal_export.h> #include <rte_common.h> diff --git a/lib/stack/rte_stack.c b/lib/stack/rte_stack.c index 4c78fe4b4b..0b9223cd3f 100644 --- a/lib/stack/rte_stack.c +++ b/lib/stack/rte_stack.c @@ -4,7 +4,6 @@ #include <stdalign.h> #include <string.h> -#include <sys/queue.h> #include <eal_export.h> #include <rte_string_fns.h> diff --git a/lib/vhost/fd_man.h b/lib/vhost/fd_man.h index eadcc6fb42..0f3f8fb430 100644 --- a/lib/vhost/fd_man.h +++ b/lib/vhost/fd_man.h @@ -6,7 +6,6 @@ #define _FD_MAN_H_ #include <pthread.h> #include <poll.h> -#include <sys/queue.h> struct fdset; diff --git a/lib/vhost/socket.c b/lib/vhost/socket.c index 9b4f332f94..107933bfd7 100644 --- a/lib/vhost/socket.c +++ b/lib/vhost/socket.c @@ -10,13 +10,13 @@ #include <string.h> #include <sys/socket.h> #include <sys/un.h> -#include <sys/queue.h> #include <errno.h> #include <fcntl.h> #include <eal_export.h> #include <rte_thread.h> #include <rte_log.h> +#include <rte_tailq.h> #include "fd_man.h" #include "vduse.h" diff --git a/lib/vhost/vdpa.c b/lib/vhost/vdpa.c index bc2dd8d2e1..4e5fcf02be 100644 --- a/lib/vhost/vdpa.c +++ b/lib/vhost/vdpa.c @@ -8,8 +8,6 @@ * Device specific vhost lib */ -#include <sys/queue.h> - #include <dev_driver.h> #include <eal_export.h> #include <rte_class.h> diff --git a/lib/vhost/vhost.h b/lib/vhost/vhost.h index 6ffc3f20c1..d42796a509 100644 --- a/lib/vhost/vhost.h +++ b/lib/vhost/vhost.h @@ -8,7 +8,6 @@ #include <stdio.h> #include <stdbool.h> #include <stdlib.h> -#include <sys/queue.h> #include <unistd.h> #include <linux/virtio_net.h> #include <sys/socket.h> @@ -19,6 +18,7 @@ #include <rte_ether.h> #include <rte_malloc.h> #include <rte_dmadev.h> +#include <rte_tailq.h> #include "rte_vhost.h" #include "vdpa_driver.h" -- 2.47.2
