From mboxrd@z Thu Jan 1 00:00:00 1970 From: Randy Dunlap Subject: Re: mmotm 2014-01-02-14-35 uploaded (brocade/bna) Date: Mon, 06 Jan 2014 17:58:05 -0800 Message-ID: <52CB5F2D.6020908@infradead.org> References: <20140102223649.D8FB931C206@corp2gmr1-1.hot.corp.google.com> <52C700B9.8040504@infradead.org> <20140106.172427.1901836894729408800.davem@davemloft.net> <20140106.203806.913798650848633178.davem@davemloft.net> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Return-path: Received: from merlin.infradead.org ([205.233.59.134]:47251 "EHLO merlin.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756131AbaAGB6R (ORCPT ); Mon, 6 Jan 2014 20:58:17 -0500 In-Reply-To: <20140106.203806.913798650848633178.davem@davemloft.net> Sender: linux-next-owner@vger.kernel.org List-ID: To: David Miller Cc: akpm@linux-foundation.org, rmody@brocade.com, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, linux-next@vger.kernel.org On 01/06/14 17:38, David Miller wrote: > From: David Miller > Date: Mon, 06 Jan 2014 17:24:27 -0500 (EST) > >> From: Randy Dunlap >> 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 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 > Signed-off-by: David S. Miller > --- > 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