]> Pileus Git - ~andy/linux/blobdiff - drivers/net/ethernet/brocade/bna/bnad.c
bna: Fix build due to missing use of dma_unmap_len_set()
[~andy/linux] / drivers / net / ethernet / brocade / bna / bnad.c
index 8d6c7525a8d087d4ed9599ccde3776d16d533934..5f24a9ffcfaafeb319af6e9f1ad7864168203097 100644 (file)
@@ -142,7 +142,8 @@ bnad_tx_buff_unmap(struct bnad *bnad,
 
                dma_unmap_page(&bnad->pcidev->dev,
                        dma_unmap_addr(&unmap->vectors[vector], dma_addr),
-                       skb_shinfo(skb)->frags[nvecs].size, DMA_TO_DEVICE);
+                       dma_unmap_len(&unmap->vectors[vector], dma_len),
+                       DMA_TO_DEVICE);
                dma_unmap_addr_set(&unmap->vectors[vector], dma_addr, 0);
                nvecs--;
        }
@@ -3045,7 +3046,7 @@ bnad_start_xmit(struct sk_buff *skb, struct net_device *netdev)
 
        for (i = 0, vect_id = 0; i < vectors - 1; i++) {
                const struct skb_frag_struct *frag = &skb_shinfo(skb)->frags[i];
-               u16             size = skb_frag_size(frag);
+               u32             size = skb_frag_size(frag);
 
                if (unlikely(size == 0)) {
                        /* Undo the changes starting at tcb->producer_index */
@@ -3070,10 +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);
+               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++;
        }