diff options
| author | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2010-04-27 14:57:05 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-28 10:07:44 -0700 |
| commit | 7cd26ce5f7dbd06698ab3413b1c5a77cf27f8c0a (patch) | |
| tree | b8ea59d8dac455fb9d0cea98cef11bb2356fcf1d /drivers/net/sky2.h | |
| parent | 214f1c87bd86f9061fedbae929bc4a7a7089ee75 (diff) | |
| download | kernel_samsung_aries-7cd26ce5f7dbd06698ab3413b1c5a77cf27f8c0a.zip kernel_samsung_aries-7cd26ce5f7dbd06698ab3413b1c5a77cf27f8c0a.tar.gz kernel_samsung_aries-7cd26ce5f7dbd06698ab3413b1c5a77cf27f8c0a.tar.bz2 | |
sky2: use the DMA state API instead of the pci equivalents
This replace the PCI DMA state API (include/linux/pci-dma.h) with the
DMA equivalents since the PCI DMA state API will be obsolete.
No functional change.
For further information about the background:
http://marc.info/?l=linux-netdev&m=127037540020276&w=2
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Acked-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/sky2.h')
| -rw-r--r-- | drivers/net/sky2.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/sky2.h b/drivers/net/sky2.h index 545a3f4..084eff2 100644 --- a/drivers/net/sky2.h +++ b/drivers/net/sky2.h @@ -2182,14 +2182,14 @@ struct tx_ring_info { unsigned long flags; #define TX_MAP_SINGLE 0x0001 #define TX_MAP_PAGE 0x0002 - DECLARE_PCI_UNMAP_ADDR(mapaddr); - DECLARE_PCI_UNMAP_LEN(maplen); + DEFINE_DMA_UNMAP_ADDR(mapaddr); + DEFINE_DMA_UNMAP_LEN(maplen); }; struct rx_ring_info { struct sk_buff *skb; dma_addr_t data_addr; - DECLARE_PCI_UNMAP_LEN(data_size); + DEFINE_DMA_UNMAP_LEN(data_size); dma_addr_t frag_addr[ETH_JUMBO_MTU >> PAGE_SHIFT]; }; |