aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/benet
diff options
context:
space:
mode:
authorFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>2010-04-01 16:53:22 +0000
committerDavid S. Miller <davem@davemloft.net>2010-04-07 20:59:25 -0700
commitfac6da5b7a1b9779ba124ce92314d02378892855 (patch)
tree660e37967f9176b9e078602ecc8f302fad895195 /drivers/net/benet
parentb0cf4dfb7cd21556efd9a6a67edcba0840b4d98d (diff)
downloadkernel_samsung_smdk4412-fac6da5b7a1b9779ba124ce92314d02378892855.zip
kernel_samsung_smdk4412-fac6da5b7a1b9779ba124ce92314d02378892855.tar.gz
kernel_samsung_smdk4412-fac6da5b7a1b9779ba124ce92314d02378892855.tar.bz2
benet: use the dma state API instead of the pci equivalents
The DMA API is preferred. Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> Acked-by: Sathya Perla <sathyap@serverengines.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/benet')
-rw-r--r--drivers/net/benet/be.h2
-rw-r--r--drivers/net/benet/be_main.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/benet/be.h b/drivers/net/benet/be.h
index 20842c5..45037fb 100644
--- a/drivers/net/benet/be.h
+++ b/drivers/net/benet/be.h
@@ -208,7 +208,7 @@ struct be_tx_obj {
/* Struct to remember the pages posted for rx frags */
struct be_rx_page_info {
struct page *page;
- dma_addr_t bus;
+ DEFINE_DMA_UNMAP_ADDR(bus);
u16 page_offset;
bool last_page_user;
};
diff --git a/drivers/net/benet/be_main.c b/drivers/net/benet/be_main.c
index 49d5196..8336183 100644
--- a/drivers/net/benet/be_main.c
+++ b/drivers/net/benet/be_main.c
@@ -720,7 +720,7 @@ get_rx_page_info(struct be_adapter *adapter, u16 frag_idx)
BUG_ON(!rx_page_info->page);
if (rx_page_info->last_page_user) {
- pci_unmap_page(adapter->pdev, pci_unmap_addr(rx_page_info, bus),
+ pci_unmap_page(adapter->pdev, dma_unmap_addr(rx_page_info, bus),
adapter->big_page_size, PCI_DMA_FROMDEVICE);
rx_page_info->last_page_user = false;
}
@@ -1031,7 +1031,7 @@ static void be_post_rx_frags(struct be_adapter *adapter)
}
page_offset = page_info->page_offset;
page_info->page = pagep;
- pci_unmap_addr_set(page_info, bus, page_dmaaddr);
+ dma_unmap_addr_set(page_info, bus, page_dmaaddr);
frag_dmaaddr = page_dmaaddr + page_info->page_offset;
rxd = queue_head_node(rxq);