Re: mmotm 2014-01-02-14-35 uploaded (brocade/bna)

Re: mmotm 2014-01-02-14-35 uploaded (brocade/bna)

[Randy Dunlap]

On 01/02/14 14:36, akpm@linux-foundation.org wrote:
> The mm-of-the-moment snapshot 2014-01-02-14-35 has been uploaded to
> 
>    http://www.ozlabs.org/~akpm/mmotm/
> 
> mmotm-readme.txt says
> 
> README for mm-of-the-moment:
> 
> http://www.ozlabs.org/~akpm/mmotm/
> 
> This is a snapshot of my -mm patch queue.  Uploaded at random hopefully
> more than once a week.
> 

on i386:

as reported for linux-next of Dec.20, 2013
when CONFIG_NEED_DMA_MAP_STATE is not enabled:

drivers/net/ethernet/brocade/bna/bnad.c: In function 'bnad_start_xmit':
drivers/net/ethernet/brocade/bna/bnad.c:3074:26: error: 'struct bnad_tx_vector' has no member named 'dma_len'



-- 
~Randy

Re: mmotm 2014-01-02-14-35 uploaded (brocade/bna)

[David Miller]

From: Randy Dunlap <rdunlap@infradead.org>
Date: Fri, 03 Jan 2014 10:26:01 -0800

> as reported for linux-next of Dec.20, 2013
> when CONFIG_NEED_DMA_MAP_STATE is not enabled:
> 
> drivers/net/ethernet/brocade/bna/bnad.c: In function 'bnad_start_xmit':
> drivers/net/ethernet/brocade/bna/bnad.c:3074:26: error: 'struct bnad_tx_vector' has no member named 'dma_len'

Sorry for taking so long, I plan to look into this tonight Randy.

Re: mmotm 2014-01-02-14-35 uploaded (brocade/bna)

[David Miller]

From: David Miller <davem@davemloft.net>
Date: Mon, 06 Jan 2014 17:24:27 -0500 (EST)

> From: Randy Dunlap <rdunlap@infradead.org>
> Date: Fri, 03 Jan 2014 10:26:01 -0800
> 
>> as reported for linux-next of Dec.20, 2013
>> when CONFIG_NEED_DMA_MAP_STATE is not enabled:
>> 
>> drivers/net/ethernet/brocade/bna/bnad.c: In function 'bnad_start_xmit':
>> drivers/net/ethernet/brocade/bna/bnad.c:3074:26: error: 'struct bnad_tx_vector' has no member named 'dma_len'
> 
> Sorry for taking so long, I plan to look into this tonight Randy.

I just committed the following fix for this, thanks!

====================
[PATCH] bna: Fix build due to missing use of dma_unmap_len_set()

> as reported for linux-next of Dec.20, 2013
> when CONFIG_NEED_DMA_MAP_STATE is not enabled:
>
> drivers/net/ethernet/brocade/bna/bnad.c: In function 'bnad_start_xmit':
> drivers/net/ethernet/brocade/bna/bnad.c:3074:26: error: 'struct bnad_tx_vector' has no member named 'dma_len'

Reported-by: Randy Dunlap <rdunlap@infradead.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
---
 drivers/net/ethernet/brocade/bna/bnad.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/brocade/bna/bnad.c b/drivers/net/ethernet/brocade/bna/bnad.c
index d31524f..5f24a9f 100644
--- a/drivers/net/ethernet/brocade/bna/bnad.c
+++ b/drivers/net/ethernet/brocade/bna/bnad.c
@@ -3071,11 +3071,11 @@ bnad_start_xmit(struct sk_buff *skb, struct net_device *netdev)
 
 		dma_addr = skb_frag_dma_map(&bnad->pcidev->dev, frag,
 					    0, size, DMA_TO_DEVICE);
-		unmap->vectors[vect_id].dma_len = size;
+		dma_unmap_len_set(&unmap->vectors[vect_id], dma_len, size);
 		BNA_SET_DMA_ADDR(dma_addr, &txqent->vector[vect_id].host_addr);
 		txqent->vector[vect_id].length = htons(size);
 		dma_unmap_addr_set(&unmap->vectors[vect_id], dma_addr,
-						dma_addr);
+				   dma_addr);
 		head_unmap->nvecs++;
 	}
 
-- 
1.7.11.7

Re: mmotm 2014-01-02-14-35 uploaded (brocade/bna)

[Randy Dunlap]

On 01/06/14 17:38, David Miller wrote:
> From: David Miller <davem@davemloft.net>
> Date: Mon, 06 Jan 2014 17:24:27 -0500 (EST)
> 
>> From: Randy Dunlap <rdunlap@infradead.org>
>> Date: Fri, 03 Jan 2014 10:26:01 -0800
>>
>>> as reported for linux-next of Dec.20, 2013
>>> when CONFIG_NEED_DMA_MAP_STATE is not enabled:
>>>
>>> drivers/net/ethernet/brocade/bna/bnad.c: In function 'bnad_start_xmit':
>>> drivers/net/ethernet/brocade/bna/bnad.c:3074:26: error: 'struct bnad_tx_vector' has no member named 'dma_len'
>>
>> Sorry for taking so long, I plan to look into this tonight Randy.
> 
> I just committed the following fix for this, thanks!
> 

Acked-by: Randy Dunlap <rdunlap@infradead.org>

Thanks, Dave.


> ====================
> [PATCH] bna: Fix build due to missing use of dma_unmap_len_set()
> 
>> as reported for linux-next of Dec.20, 2013
>> when CONFIG_NEED_DMA_MAP_STATE is not enabled:
>>
>> drivers/net/ethernet/brocade/bna/bnad.c: In function 'bnad_start_xmit':
>> drivers/net/ethernet/brocade/bna/bnad.c:3074:26: error: 'struct bnad_tx_vector' has no member named 'dma_len'
> 
> Reported-by: Randy Dunlap <rdunlap@infradead.org>
> Signed-off-by: David S. Miller <davem@davemloft.net>
> ---
>  drivers/net/ethernet/brocade/bna/bnad.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/net/ethernet/brocade/bna/bnad.c b/drivers/net/ethernet/brocade/bna/bnad.c
> index d31524f..5f24a9f 100644
> --- a/drivers/net/ethernet/brocade/bna/bnad.c
> +++ b/drivers/net/ethernet/brocade/bna/bnad.c
> @@ -3071,11 +3071,11 @@ bnad_start_xmit(struct sk_buff *skb, struct net_device *netdev)
>  
>  		dma_addr = skb_frag_dma_map(&bnad->pcidev->dev, frag,
>  					    0, size, DMA_TO_DEVICE);
> -		unmap->vectors[vect_id].dma_len = size;
> +		dma_unmap_len_set(&unmap->vectors[vect_id], dma_len, size);
>  		BNA_SET_DMA_ADDR(dma_addr, &txqent->vector[vect_id].host_addr);
>  		txqent->vector[vect_id].length = htons(size);
>  		dma_unmap_addr_set(&unmap->vectors[vect_id], dma_addr,
> -						dma_addr);
> +				   dma_addr);
>  		head_unmap->nvecs++;
>  	}
>  
> 


-- 
~Randy