linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: David Miller <davem@davemloft.net>
To: rdunlap@infradead.org
Cc: akpm@linux-foundation.org, rmody@brocade.com,
	linux-kernel@vger.kernel.org, netdev@vger.kernel.org,
	linux-next@vger.kernel.org
Subject: Re: mmotm 2014-01-02-14-35 uploaded (brocade/bna)
Date: Mon, 06 Jan 2014 20:38:06 -0500 (EST)	[thread overview]
Message-ID: <20140106.203806.913798650848633178.davem@davemloft.net> (raw)
In-Reply-To: <20140106.172427.1901836894729408800.davem@davemloft.net>

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

  reply	other threads:[~2014-01-07  1:38 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-01-02 22:36 mmotm 2014-01-02-14-35 uploaded akpm
2014-01-03 17:57 ` mmotm 2014-01-02-14-35 uploaded (musb) Randy Dunlap
2014-01-03 20:02   ` Felipe Balbi
2014-01-03 20:47     ` Randy Dunlap
2014-01-03 18:26 ` mmotm 2014-01-02-14-35 uploaded (brocade/bna) Randy Dunlap
2014-01-06 22:24   ` David Miller
2014-01-07  1:38     ` David Miller [this message]
2014-01-07  1:58       ` Randy Dunlap

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20140106.203806.913798650848633178.davem@davemloft.net \
    --to=davem@davemloft.net \
    --cc=akpm@linux-foundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=rdunlap@infradead.org \
    --cc=rmody@brocade.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).