Commit fac6da5b authored by FUJITA Tomonori's avatar FUJITA Tomonori Committed by David S. Miller
Browse files

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



The DMA API is preferred.

Signed-off-by: default avatarFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Acked-by: default avatarSathya Perla <sathyap@serverengines.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b0cf4dfb

drivers/net/benet/be.h

+1 −1
Original line number Diff line number Diff line
@@ -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;

};

drivers/net/benet/be_main.c

+2 −2
Original line number Diff line number Diff line
@@ -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);