[dpdk-dev] [PATCH] net/bnxt: rename a member to avoid conflict

[Ajit Khaparde]

On Thu, Mar 11, 2021 at 3:30 PM Ajit Khaparde
<ajit.khaparde at broadcom.com> wrote:
>
> Address build issues with Clang and without glibc on ppc64le.
> Vector can be a keyword and should not be used in code.
> Renaming it to avoid conflict.
>
> Reported-by: Piotr Kubaj <pkubaj at FreeBSD.org>
> Signed-off-by: Ajit Khaparde <ajit.khaparde at broadcom.com>
Patch applied to dpdk-next-net-brcm. Thanks

> ---
>  drivers/net/bnxt/bnxt_irq.c | 2 +-
>  drivers/net/bnxt/bnxt_irq.h | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/bnxt/bnxt_irq.c b/drivers/net/bnxt/bnxt_irq.c
> index a29ac28590..8abbadb3d1 100644
> --- a/drivers/net/bnxt/bnxt_irq.c
> +++ b/drivers/net/bnxt/bnxt_irq.c
> @@ -151,7 +151,7 @@ int bnxt_setup_int(struct bnxt *bp)
>                                  sizeof(struct bnxt_irq), 0);
>         if (bp->irq_tbl) {
>                 for (i = 0; i < total_vecs; i++) {
> -                       bp->irq_tbl[i].vector = i;
> +                       bp->irq_tbl[i].vector_idx = i;
>                         snprintf(bp->irq_tbl[i].name, len,
>                                  "%s-%d", bp->eth_dev->device->name, i);
>                         bp->irq_tbl[i].handler = bnxt_int_handler;
> diff --git a/drivers/net/bnxt/bnxt_irq.h b/drivers/net/bnxt/bnxt_irq.h
> index 7b02f30973..53d9198858 100644
> --- a/drivers/net/bnxt/bnxt_irq.h
> +++ b/drivers/net/bnxt/bnxt_irq.h
> @@ -8,7 +8,7 @@
>
>  struct bnxt_irq {
>         rte_intr_callback_fn    handler;
> -       unsigned int            vector;
> +       unsigned int            vector_idx;
>         uint8_t                 requested;
>         char                    name[RTE_ETH_NAME_MAX_LEN + 2];
>  };
> --
> 2.21.1 (Apple Git-122.3)
>