[dpdk-dev] [PATCH] eal: remove unnecessary #ifdef CONFIG_BQL

[dpdk-dev] [PATCH] eal: remove unnecessary #ifdef CONFIG_BQL

[Alex Gartrell]

I couldn't figure out why this #ifdef existed so I looked around upstream
and it's not there.  It seems to build just fine without it.

Signed-off-by: Alex Gartrell <agartrell@fb.com>
---
 lib/librte_eal/linuxapp/kni/ethtool/igb/igb.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/lib/librte_eal/linuxapp/kni/ethtool/igb/igb.h b/lib/librte_eal/linuxapp/kni/ethtool/igb/igb.h
index a582f52..d58e1f3 100644
--- a/lib/librte_eal/linuxapp/kni/ethtool/igb/igb.h
+++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/igb.h
@@ -472,12 +472,10 @@ static inline u16 igb_desc_unused(const struct igb_ring *ring)
 	return ((ntc > ntu) ? 0 : ring->count) + ntc - ntu - 1;
 }
 
-#ifdef CONFIG_BQL
 static inline struct netdev_queue *txring_txq(const struct igb_ring *tx_ring)
 {
 	return netdev_get_tx_queue(tx_ring->netdev, tx_ring->queue_index);
 }
-#endif /* CONFIG_BQL */
 
 // #ifdef EXT_THERMAL_SENSOR_SUPPORT
 // #ifdef IGB_PROCFS
-- 
Alex Gartrell <agartrell@fb.com>

Re: [dpdk-dev] [PATCH] eal: remove unnecessary #ifdef CONFIG_BQL

[Thomas Monjalon]

Helin, any comment about this trivial patch?

2015-03-13 12:21, Alex Gartrell:
> I couldn't figure out why this #ifdef existed so I looked around upstream
> and it's not there.  It seems to build just fine without it.
> 
> Signed-off-by: Alex Gartrell <agartrell@fb.com>
> ---
>  lib/librte_eal/linuxapp/kni/ethtool/igb/igb.h | 2 --
>  1 file changed, 2 deletions(-)
> 
> diff --git a/lib/librte_eal/linuxapp/kni/ethtool/igb/igb.h b/lib/librte_eal/linuxapp/kni/ethtool/igb/igb.h
> index a582f52..d58e1f3 100644
> --- a/lib/librte_eal/linuxapp/kni/ethtool/igb/igb.h
> +++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/igb.h
> @@ -472,12 +472,10 @@ static inline u16 igb_desc_unused(const struct igb_ring *ring)
>  	return ((ntc > ntu) ? 0 : ring->count) + ntc - ntu - 1;
>  }
>  
> -#ifdef CONFIG_BQL
>  static inline struct netdev_queue *txring_txq(const struct igb_ring *tx_ring)
>  {
>  	return netdev_get_tx_queue(tx_ring->netdev, tx_ring->queue_index);
>  }
> -#endif /* CONFIG_BQL */
>  
>  // #ifdef EXT_THERMAL_SENSOR_SUPPORT
>  // #ifdef IGB_PROCFS
> 

Re: [dpdk-dev] [PATCH] eal: remove unnecessary #ifdef CONFIG_BQL

[Zhang, Helin]

Hi Alex

> -----Original Message-----
> From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Alex Gartrell
> Sent: Saturday, March 14, 2015 3:22 AM
> To: dev@dpdk.org
> Cc: kernel-team@fb.com
> Subject: [dpdk-dev] [PATCH] eal: remove unnecessary #ifdef CONFIG_BQL
> 
> I couldn't figure out why this #ifdef existed so I looked around upstream and it's
> not there.  It seems to build just fine without it.

You can see in igb/kcomat.h of below code section.

#ifndef CONFIG_BQL
#define netdev_tx_completed_queue(_q, _p, _b) do {} while (0)
#define netdev_completed_queue(_n, _p, _b) do {} while (0)
#define netdev_tx_sent_queue(_q, _b) do {} while (0)
#define netdev_sent_queue(_n, _b) do {} while (0)
#define netdev_tx_reset_queue(_q) do {} while (0)
#define netdev_reset_queue(_n) do {} while (0)
#endif

That means all callers of txring_txq() are conditional compiled. I don't think your
modifications are needed.

Regards,
Helin

> 
> Signed-off-by: Alex Gartrell <agartrell@fb.com>
> ---
>  lib/librte_eal/linuxapp/kni/ethtool/igb/igb.h | 2 --
>  1 file changed, 2 deletions(-)
> 
> diff --git a/lib/librte_eal/linuxapp/kni/ethtool/igb/igb.h
> b/lib/librte_eal/linuxapp/kni/ethtool/igb/igb.h
> index a582f52..d58e1f3 100644
> --- a/lib/librte_eal/linuxapp/kni/ethtool/igb/igb.h
> +++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/igb.h
> @@ -472,12 +472,10 @@ static inline u16 igb_desc_unused(const struct
> igb_ring *ring)
>  	return ((ntc > ntu) ? 0 : ring->count) + ntc - ntu - 1;  }
> 
> -#ifdef CONFIG_BQL
>  static inline struct netdev_queue *txring_txq(const struct igb_ring *tx_ring)
> {
>  	return netdev_get_tx_queue(tx_ring->netdev, tx_ring->queue_index);  }
> -#endif /* CONFIG_BQL */
> 
>  // #ifdef EXT_THERMAL_SENSOR_SUPPORT
>  // #ifdef IGB_PROCFS
> --
> Alex Gartrell <agartrell@fb.com>