diff options
Diffstat (limited to 'drivers/net/ethernet/sun/cassini.c')
-rw-r--r-- | drivers/net/ethernet/sun/cassini.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/ethernet/sun/cassini.c b/drivers/net/ethernet/sun/cassini.c index d9460d81a137..fd40988c19a6 100644 --- a/drivers/net/ethernet/sun/cassini.c +++ b/drivers/net/ethernet/sun/cassini.c | |||
@@ -2051,7 +2051,7 @@ static int cas_rx_process_pkt(struct cas *cp, struct cas_rx_comp *rxc, | |||
2051 | __skb_frag_set_page(frag, page->buffer); | 2051 | __skb_frag_set_page(frag, page->buffer); |
2052 | __skb_frag_ref(frag); | 2052 | __skb_frag_ref(frag); |
2053 | frag->page_offset = off; | 2053 | frag->page_offset = off; |
2054 | frag->size = hlen - swivel; | 2054 | skb_frag_size_set(frag, hlen - swivel); |
2055 | 2055 | ||
2056 | /* any more data? */ | 2056 | /* any more data? */ |
2057 | if ((words[0] & RX_COMP1_SPLIT_PKT) && ((dlen -= hlen) > 0)) { | 2057 | if ((words[0] & RX_COMP1_SPLIT_PKT) && ((dlen -= hlen) > 0)) { |
@@ -2075,7 +2075,7 @@ static int cas_rx_process_pkt(struct cas *cp, struct cas_rx_comp *rxc, | |||
2075 | __skb_frag_set_page(frag, page->buffer); | 2075 | __skb_frag_set_page(frag, page->buffer); |
2076 | __skb_frag_ref(frag); | 2076 | __skb_frag_ref(frag); |
2077 | frag->page_offset = 0; | 2077 | frag->page_offset = 0; |
2078 | frag->size = hlen; | 2078 | skb_frag_size_set(frag, hlen); |
2079 | RX_USED_ADD(page, hlen + cp->crc_size); | 2079 | RX_USED_ADD(page, hlen + cp->crc_size); |
2080 | } | 2080 | } |
2081 | 2081 | ||
@@ -2826,9 +2826,9 @@ static inline int cas_xmit_tx_ringN(struct cas *cp, int ring, | |||
2826 | entry = TX_DESC_NEXT(ring, entry); | 2826 | entry = TX_DESC_NEXT(ring, entry); |
2827 | 2827 | ||
2828 | for (frag = 0; frag < nr_frags; frag++) { | 2828 | for (frag = 0; frag < nr_frags; frag++) { |
2829 | skb_frag_t *fragp = &skb_shinfo(skb)->frags[frag]; | 2829 | const skb_frag_t *fragp = &skb_shinfo(skb)->frags[frag]; |
2830 | 2830 | ||
2831 | len = fragp->size; | 2831 | len = skb_frag_size(fragp); |
2832 | mapping = skb_frag_dma_map(&cp->pdev->dev, fragp, 0, len, | 2832 | mapping = skb_frag_dma_map(&cp->pdev->dev, fragp, 0, len, |
2833 | DMA_TO_DEVICE); | 2833 | DMA_TO_DEVICE); |
2834 | 2834 | ||