aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c')
-rw-r--r--drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
index eac19e7d276..106503f118f 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
@@ -2135,13 +2135,13 @@ qlcnic_map_tx_skb(struct pci_dev *pdev,
2135 frag = &skb_shinfo(skb)->frags[i]; 2135 frag = &skb_shinfo(skb)->frags[i];
2136 nf = &pbuf->frag_array[i+1]; 2136 nf = &pbuf->frag_array[i+1];
2137 2137
2138 map = skb_frag_dma_map(&pdev->dev, frag, 0, frag->size, 2138 map = skb_frag_dma_map(&pdev->dev, frag, 0, skb_frag_size(frag),
2139 DMA_TO_DEVICE); 2139 DMA_TO_DEVICE);
2140 if (dma_mapping_error(&pdev->dev, map)) 2140 if (dma_mapping_error(&pdev->dev, map))
2141 goto unwind; 2141 goto unwind;
2142 2142
2143 nf->dma = map; 2143 nf->dma = map;
2144 nf->length = frag->size; 2144 nf->length = skb_frag_size(frag);
2145 } 2145 }
2146 2146
2147 return 0; 2147 return 0;
@@ -2221,7 +2221,7 @@ qlcnic_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
2221 if (!skb_is_gso(skb) && frag_count > QLCNIC_MAX_FRAGS_PER_TX) { 2221 if (!skb_is_gso(skb) && frag_count > QLCNIC_MAX_FRAGS_PER_TX) {
2222 2222
2223 for (i = 0; i < (frag_count - QLCNIC_MAX_FRAGS_PER_TX); i++) 2223 for (i = 0; i < (frag_count - QLCNIC_MAX_FRAGS_PER_TX); i++)
2224 delta += skb_shinfo(skb)->frags[i].size; 2224 delta += skb_frag_size(&skb_shinfo(skb)->frags[i]);
2225 2225
2226 if (!__pskb_pull_tail(skb, delta)) 2226 if (!__pskb_pull_tail(skb, delta))
2227 goto drop_packet; 2227 goto drop_packet;