[dpdk-dev,v2] e1000: mark rxq with RTE_SET_USED

Message ID 1446048480-9139-1-git-send-email-harry.van.haaren@intel.com (mailing list archive)
State Accepted, archived
Headers

Commit Message

Van Haaren, Harry Oct. 28, 2015, 4:08 p.m. UTC
  This patch marks rxq with RTE_SET_USED in
rx_desc_hlen_type_rss_to_pkt_flags(), when
ieee1588 is disabled. Previously a compilation
error occurred on unused-parameter.

Fixes: 1ce6591e238a ("igb: fix ieee1588 frame identification in i210")

Signed-off-by: Harry van Haaren <harry.van.haaren@intel.com>
---

v2: Fixed Fixes line (the irony)

 drivers/net/e1000/igb_rxtx.c | 2 ++
 1 file changed, 2 insertions(+)
  

Comments

De Lara Guarch, Pablo Oct. 28, 2015, 4:18 p.m. UTC | #1
> -----Original Message-----
> From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Harry van Haaren
> Sent: Wednesday, October 28, 2015 4:08 PM
> To: dev@dpdk.org
> Subject: [dpdk-dev] [PATCH v2] e1000: mark rxq with RTE_SET_USED
> 
> This patch marks rxq with RTE_SET_USED in
> rx_desc_hlen_type_rss_to_pkt_flags(), when
> ieee1588 is disabled. Previously a compilation
> error occurred on unused-parameter.
> 
> Fixes: 1ce6591e238a ("igb: fix ieee1588 frame identification in i210")
> 
> Signed-off-by: Harry van Haaren <harry.van.haaren@intel.com>
> ---
> 
> v2: Fixed Fixes line (the irony)
> 
>  drivers/net/e1000/igb_rxtx.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/drivers/net/e1000/igb_rxtx.c b/drivers/net/e1000/igb_rxtx.c
> index 66bc3f0..d734a19 100644
> --- a/drivers/net/e1000/igb_rxtx.c
> +++ b/drivers/net/e1000/igb_rxtx.c
> @@ -732,6 +732,8 @@ rx_desc_hlen_type_rss_to_pkt_flags(struct
> igb_rx_queue *rxq, uint32_t hl_tp_rs)
>  		pkt_flags |= ip_pkt_etqf_map[(hl_tp_rs >> 12) & 0x07];
>  	else
>  		pkt_flags |= ip_pkt_etqf_map[(hl_tp_rs >> 4) & 0x07];
> +#else
> +	RTE_SET_USED(rxq);
>  #endif
> 
>  	return pkt_flags;
> --
> 1.9.1

Acked-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>
  
Thomas Monjalon Oct. 28, 2015, 5:13 p.m. UTC | #2
2015-10-28 16:18, De Lara Guarch, Pablo:
> > This patch marks rxq with RTE_SET_USED in
> > rx_desc_hlen_type_rss_to_pkt_flags(), when
> > ieee1588 is disabled. Previously a compilation
> > error occurred on unused-parameter.
> > 
> > Fixes: 1ce6591e238a ("igb: fix ieee1588 frame identification in i210")
> > 
> > Signed-off-by: Harry van Haaren <harry.van.haaren@intel.com>
> 
> Acked-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>

Applied, thanks

To avoid such break, we must check carefully the compilation with
different combinations of options.
Hope the automated tests will help us more in the near future.
  

Patch

diff --git a/drivers/net/e1000/igb_rxtx.c b/drivers/net/e1000/igb_rxtx.c
index 66bc3f0..d734a19 100644
--- a/drivers/net/e1000/igb_rxtx.c
+++ b/drivers/net/e1000/igb_rxtx.c
@@ -732,6 +732,8 @@  rx_desc_hlen_type_rss_to_pkt_flags(struct igb_rx_queue *rxq, uint32_t hl_tp_rs)
 		pkt_flags |= ip_pkt_etqf_map[(hl_tp_rs >> 12) & 0x07];
 	else
 		pkt_flags |= ip_pkt_etqf_map[(hl_tp_rs >> 4) & 0x07];
+#else
+	RTE_SET_USED(rxq);
 #endif
 
 	return pkt_flags;