aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/mellanox/mlx4/en_tx.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/ethernet/mellanox/mlx4/en_tx.c')
-rw-r--r--drivers/net/ethernet/mellanox/mlx4/en_tx.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_tx.c b/drivers/net/ethernet/mellanox/mlx4/en_tx.c
index 6e03de034ac7..2a192c2f207d 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_tx.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_tx.c
@@ -226,7 +226,7 @@ static u32 mlx4_en_free_tx_desc(struct mlx4_en_priv *priv,
226 frag = &skb_shinfo(skb)->frags[i]; 226 frag = &skb_shinfo(skb)->frags[i];
227 pci_unmap_page(mdev->pdev, 227 pci_unmap_page(mdev->pdev,
228 (dma_addr_t) be64_to_cpu(data[i].addr), 228 (dma_addr_t) be64_to_cpu(data[i].addr),
229 frag->size, PCI_DMA_TODEVICE); 229 skb_frag_size(frag), PCI_DMA_TODEVICE);
230 } 230 }
231 } 231 }
232 /* Stamp the freed descriptor */ 232 /* Stamp the freed descriptor */
@@ -256,7 +256,7 @@ static u32 mlx4_en_free_tx_desc(struct mlx4_en_priv *priv,
256 frag = &skb_shinfo(skb)->frags[i]; 256 frag = &skb_shinfo(skb)->frags[i];
257 pci_unmap_page(mdev->pdev, 257 pci_unmap_page(mdev->pdev,
258 (dma_addr_t) be64_to_cpu(data->addr), 258 (dma_addr_t) be64_to_cpu(data->addr),
259 frag->size, PCI_DMA_TODEVICE); 259 skb_frag_size(frag), PCI_DMA_TODEVICE);
260 ++data; 260 ++data;
261 } 261 }
262 } 262 }
@@ -550,7 +550,7 @@ static void build_inline_wqe(struct mlx4_en_tx_desc *tx_desc, struct sk_buff *sk
550 skb_copy_from_linear_data(skb, inl + 1, skb_headlen(skb)); 550 skb_copy_from_linear_data(skb, inl + 1, skb_headlen(skb));
551 if (skb_shinfo(skb)->nr_frags) 551 if (skb_shinfo(skb)->nr_frags)
552 memcpy(((void *)(inl + 1)) + skb_headlen(skb), fragptr, 552 memcpy(((void *)(inl + 1)) + skb_headlen(skb), fragptr,
553 skb_shinfo(skb)->frags[0].size); 553 skb_frag_size(&skb_shinfo(skb)->frags[0]));
554 554
555 } else { 555 } else {
556 inl->byte_count = cpu_to_be32(1 << 31 | spc); 556 inl->byte_count = cpu_to_be32(1 << 31 | spc);
@@ -570,7 +570,7 @@ static void build_inline_wqe(struct mlx4_en_tx_desc *tx_desc, struct sk_buff *sk
570 skb_headlen(skb) - spc); 570 skb_headlen(skb) - spc);
571 if (skb_shinfo(skb)->nr_frags) 571 if (skb_shinfo(skb)->nr_frags)
572 memcpy(((void *)(inl + 1)) + skb_headlen(skb) - spc, 572 memcpy(((void *)(inl + 1)) + skb_headlen(skb) - spc,
573 fragptr, skb_shinfo(skb)->frags[0].size); 573 fragptr, skb_frag_size(&skb_shinfo(skb)->frags[0]));
574 } 574 }
575 575
576 wmb(); 576 wmb();
@@ -757,11 +757,11 @@ netdev_tx_t mlx4_en_xmit(struct sk_buff *skb, struct net_device *dev)
757 for (i = skb_shinfo(skb)->nr_frags - 1; i >= 0; i--) { 757 for (i = skb_shinfo(skb)->nr_frags - 1; i >= 0; i--) {
758 frag = &skb_shinfo(skb)->frags[i]; 758 frag = &skb_shinfo(skb)->frags[i];
759 dma = pci_map_page(mdev->dev->pdev, frag->page, frag->page_offset, 759 dma = pci_map_page(mdev->dev->pdev, frag->page, frag->page_offset,
760 frag->size, PCI_DMA_TODEVICE); 760 skb_frag_size(frag), PCI_DMA_TODEVICE);
761 data->addr = cpu_to_be64(dma); 761 data->addr = cpu_to_be64(dma);
762 data->lkey = cpu_to_be32(mdev->mr.key); 762 data->lkey = cpu_to_be32(mdev->mr.key);
763 wmb(); 763 wmb();
764 data->byte_count = cpu_to_be32(frag->size); 764 data->byte_count = cpu_to_be32(skb_frag_size(frag));
765 --data; 765 --data;
766 } 766 }
767 767