[dpdk-dev] [PATCH] drivers/net: do not redefine bool

[Shaikh, Shahed]

> -----Original Message-----
> From: Thomas Monjalon <thomas at monjalon.net>
> Sent: Thursday, September 20, 2018 5:49 AM
> To: Ferruh Yigit <ferruh.yigit at intel.com>; Rahul Lakkireddy
> <rahul.lakkireddy at chelsio.com>; Wenzhuo Lu <wenzhuo.lu at intel.com>; Qi
> Zhang <qi.z.zhang at intel.com>; Xiao Wang <xiao.w.wang at intel.com>;
> Konstantin Ananyev <konstantin.ananyev at intel.com>; Mody, Rasesh
> <Rasesh.Mody at cavium.com>; Patil, Harish <Harish.Patil at cavium.com>; Shaikh,
> Shahed <Shahed.Shaikh at cavium.com>; Yong Wang <yongwang at vmware.com>
> Cc: dev at dpdk.org
> Subject: [PATCH] drivers/net: do not redefine bool
> 
> External Email
> 
> When trying to include stdbool.h in DPDK base headers, there are a lot
> of conflicts with drivers which redefine bool/true/false
> in their compatibility layer.
> 
> It is fixed by including stdbool.h in these drivers.
> Some errors with usage of bool type are also fixed in some drivers.
> 
> Note: the driver qede has a surprising mix of bool and int:
>         (~p_iov->b_pre_fp_hsi & ETH_HSI_VER_MINOR)
> where the first variable is boolean and the version is a number.
> It is replaced by
>         !p_iov->b_pre_fp_hsi
> 
> Signed-off-by: Thomas Monjalon <thomas at monjalon.net>
> ---
>  drivers/net/cxgbe/cxgbe_compat.h         |  2 +-
>  drivers/net/e1000/base/e1000_osdep.h     |  5 +----
>  drivers/net/fm10k/base/fm10k_osdep.h     |  8 +-------
>  drivers/net/fm10k/fm10k_ethdev.c         |  4 ++--
>  drivers/net/ixgbe/base/ixgbe_osdep.h     |  6 +-----
>  drivers/net/ixgbe/ixgbe_ethdev.c         | 16 +++++++++-------
>  drivers/net/ixgbe/ixgbe_rxtx.c           |  2 +-
>  drivers/net/qede/base/bcm_osal.h         |  6 ++----
>  drivers/net/qede/base/ecore_vf.c         |  3 +--
>  drivers/net/qede/qede_ethdev.c           |  2 +-
>  drivers/net/vmxnet3/base/vmxnet3_osdep.h |  3 ++-
>  11 files changed, 22 insertions(+), 35 deletions(-)
> 
 ...
> 
>  /* Delays */
> diff --git a/drivers/net/qede/base/ecore_vf.c
> b/drivers/net/qede/base/ecore_vf.c
> index d2213f793..f5deb2916 100644
> --- a/drivers/net/qede/base/ecore_vf.c
> +++ b/drivers/net/qede/base/ecore_vf.c
> @@ -445,8 +445,7 @@ static enum _ecore_status_t ecore_vf_pf_acquire(struct
> ecore_hwfn *p_hwfn)
>         }
> 
>         /* @DPDK */
> -       if ((~p_iov->b_pre_fp_hsi &
> -           ETH_HSI_VER_MINOR) &&
> +       if (!p_iov->b_pre_fp_hsi &&
>             (resp->pfdev_info.minor_fp_hsi < ETH_HSI_VER_MINOR))
>                 DP_INFO(p_hwfn,
>                         "PF is using older fastpath HSI;"
> diff --git a/drivers/net/qede/qede_ethdev.c b/drivers/net/qede/qede_ethdev.c
> index 7bb52b157..53a767b3e 100644
> --- a/drivers/net/qede/qede_ethdev.c
> +++ b/drivers/net/qede/qede_ethdev.c
> @@ -534,7 +534,7 @@ int qede_activate_vport(struct rte_eth_dev *eth_dev,
> bool flg)
>         params.update_vport_active_tx_flg = 1;
>         params.vport_active_rx_flg = flg;
>         params.vport_active_tx_flg = flg;
> -       if (~qdev->enable_tx_switching & flg) {
> +       if (!qdev->enable_tx_switching && flg) {
>                 params.update_tx_switching_flg = 1;
>                 params.tx_switching_flg = !flg;
>         }

For qede changes -
Acked-by: Shahed Shaikh <shahed.shaikh at cavium.com>