diff options
Diffstat (limited to 'drivers/net/ethernet/amd/xgbe/xgbe-drv.c')
| -rw-r--r-- | drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c index 1e9c28d19ef8..aae9d5ecd182 100644 --- a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c +++ b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c | |||
| @@ -1765,8 +1765,9 @@ static struct sk_buff *xgbe_create_skb(struct xgbe_prv_data *pdata, | |||
| 1765 | /* Start with the header buffer which may contain just the header | 1765 | /* Start with the header buffer which may contain just the header |
| 1766 | * or the header plus data | 1766 | * or the header plus data |
| 1767 | */ | 1767 | */ |
| 1768 | dma_sync_single_for_cpu(pdata->dev, rdata->rx.hdr.dma, | 1768 | dma_sync_single_range_for_cpu(pdata->dev, rdata->rx.hdr.dma_base, |
| 1769 | rdata->rx.hdr.dma_len, DMA_FROM_DEVICE); | 1769 | rdata->rx.hdr.dma_off, |
| 1770 | rdata->rx.hdr.dma_len, DMA_FROM_DEVICE); | ||
| 1770 | 1771 | ||
| 1771 | packet = page_address(rdata->rx.hdr.pa.pages) + | 1772 | packet = page_address(rdata->rx.hdr.pa.pages) + |
| 1772 | rdata->rx.hdr.pa.pages_offset; | 1773 | rdata->rx.hdr.pa.pages_offset; |
| @@ -1778,8 +1779,11 @@ static struct sk_buff *xgbe_create_skb(struct xgbe_prv_data *pdata, | |||
| 1778 | len -= copy_len; | 1779 | len -= copy_len; |
| 1779 | if (len) { | 1780 | if (len) { |
| 1780 | /* Add the remaining data as a frag */ | 1781 | /* Add the remaining data as a frag */ |
| 1781 | dma_sync_single_for_cpu(pdata->dev, rdata->rx.buf.dma, | 1782 | dma_sync_single_range_for_cpu(pdata->dev, |
| 1782 | rdata->rx.buf.dma_len, DMA_FROM_DEVICE); | 1783 | rdata->rx.buf.dma_base, |
| 1784 | rdata->rx.buf.dma_off, | ||
| 1785 | rdata->rx.buf.dma_len, | ||
| 1786 | DMA_FROM_DEVICE); | ||
| 1783 | 1787 | ||
| 1784 | skb_add_rx_frag(skb, skb_shinfo(skb)->nr_frags, | 1788 | skb_add_rx_frag(skb, skb_shinfo(skb)->nr_frags, |
| 1785 | rdata->rx.buf.pa.pages, | 1789 | rdata->rx.buf.pa.pages, |
| @@ -1945,8 +1949,9 @@ read_again: | |||
| 1945 | if (!skb) | 1949 | if (!skb) |
| 1946 | error = 1; | 1950 | error = 1; |
| 1947 | } else if (rdesc_len) { | 1951 | } else if (rdesc_len) { |
| 1948 | dma_sync_single_for_cpu(pdata->dev, | 1952 | dma_sync_single_range_for_cpu(pdata->dev, |
| 1949 | rdata->rx.buf.dma, | 1953 | rdata->rx.buf.dma_base, |
| 1954 | rdata->rx.buf.dma_off, | ||
| 1950 | rdata->rx.buf.dma_len, | 1955 | rdata->rx.buf.dma_len, |
| 1951 | DMA_FROM_DEVICE); | 1956 | DMA_FROM_DEVICE); |
| 1952 | 1957 | ||
