lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

benet: use the dma state API instead of the pci equivalents

Browse Source 
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>
This commit is contained in:
FUJITA Tomonori
2010-04-01 16:53:22 +00:00
committed by David S. Miller
parent b0cf4dfb7c
commit fac6da5b7a
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/benet/be.h
View File

@@ -208,7 +208,7 @@ struct be_tx_obj {
/* Struct to remember the pages posted for rx frags */ /* Struct to remember the pages posted for rx frags */
struct be_rx_page_info { struct be_rx_page_info {
struct page *page; struct page *page;
dma_addr_t bus; DEFINE_DMA_UNMAP_ADDR(bus);
u16 page_offset; u16 page_offset;
bool last_page_user; bool last_page_user;
}; };

4
drivers/net/benet/be_main.c
View File

@@ -720,7 +720,7 @@ get_rx_page_info(struct be_adapter *adapter, u16 frag_idx)
BUG_ON(!rx_page_info->page); BUG_ON(!rx_page_info->page);
if (rx_page_info->last_page_user) { 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); adapter->big_page_size, PCI_DMA_FROMDEVICE);
rx_page_info->last_page_user = false; 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_offset = page_info->page_offset;
page_info->page = pagep; 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; frag_dmaaddr = page_dmaaddr + page_info->page_offset;
rxd = queue_head_node(rxq); rxd = queue_head_node(rxq);