aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/marvell/mv643xx_eth.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/ethernet/marvell/mv643xx_eth.c')
-rw-r--r--drivers/net/ethernet/marvell/mv643xx_eth.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/net/ethernet/marvell/mv643xx_eth.c b/drivers/net/ethernet/marvell/mv643xx_eth.c
index f6821aa5ffbf..194a03113802 100644
--- a/drivers/net/ethernet/marvell/mv643xx_eth.c
+++ b/drivers/net/ethernet/marvell/mv643xx_eth.c
@@ -713,8 +713,9 @@ static inline unsigned int has_tiny_unaligned_frags(struct sk_buff *skb)
713 int frag; 713 int frag;
714 714
715 for (frag = 0; frag < skb_shinfo(skb)->nr_frags; frag++) { 715 for (frag = 0; frag < skb_shinfo(skb)->nr_frags; frag++) {
716 skb_frag_t *fragp = &skb_shinfo(skb)->frags[frag]; 716 const skb_frag_t *fragp = &skb_shinfo(skb)->frags[frag];
717 if (fragp->size <= 8 && fragp->page_offset & 7) 717
718 if (skb_frag_size(fragp) <= 8 && fragp->page_offset & 7)
718 return 1; 719 return 1;
719 } 720 }
720 721
@@ -751,10 +752,10 @@ static void txq_submit_frag_skb(struct tx_queue *txq, struct sk_buff *skb)
751 } 752 }
752 753
753 desc->l4i_chk = 0; 754 desc->l4i_chk = 0;
754 desc->byte_cnt = this_frag->size; 755 desc->byte_cnt = skb_frag_size(this_frag);
755 desc->buf_ptr = skb_frag_dma_map(mp->dev->dev.parent, 756 desc->buf_ptr = skb_frag_dma_map(mp->dev->dev.parent,
756 this_frag, 0, 757 this_frag, 0,
757 this_frag->size, 758 skb_frag_size(this_frag),
758 DMA_TO_DEVICE); 759 DMA_TO_DEVICE);
759 } 760 }
760} 761}