aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/sky2.h
diff options
context:
space:
mode:
authorFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>2010-04-27 10:57:05 -0400
committerDavid S. Miller <davem@davemloft.net>2010-04-28 13:07:44 -0400
commit7cd26ce5f7dbd06698ab3413b1c5a77cf27f8c0a (patch)
treeb8ea59d8dac455fb9d0cea98cef11bb2356fcf1d /drivers/net/sky2.h
parent214f1c87bd86f9061fedbae929bc4a7a7089ee75 (diff)
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.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/sky2.h b/drivers/net/sky2.h
index 545a3f41ef56..084eff21b67a 100644
--- a/drivers/net/sky2.h
+++ b/drivers/net/sky2.h
@@ -2182,14 +2182,14 @@ struct tx_ring_info {
2182 unsigned long flags; 2182 unsigned long flags;
2183#define TX_MAP_SINGLE 0x0001 2183#define TX_MAP_SINGLE 0x0001
2184#define TX_MAP_PAGE 0x0002 2184#define TX_MAP_PAGE 0x0002
2185 DECLARE_PCI_UNMAP_ADDR(mapaddr); 2185 DEFINE_DMA_UNMAP_ADDR(mapaddr);
2186 DECLARE_PCI_UNMAP_LEN(maplen); 2186 DEFINE_DMA_UNMAP_LEN(maplen);
2187}; 2187};
2188 2188
2189struct rx_ring_info { 2189struct rx_ring_info {
2190 struct sk_buff *skb; 2190 struct sk_buff *skb;
2191 dma_addr_t data_addr; 2191 dma_addr_t data_addr;
2192 DECLARE_PCI_UNMAP_LEN(data_size); 2192 DEFINE_DMA_UNMAP_LEN(data_size);
2193 dma_addr_t frag_addr[ETH_JUMBO_MTU >> PAGE_SHIFT]; 2193 dma_addr_t frag_addr[ETH_JUMBO_MTU >> PAGE_SHIFT];
2194}; 2194};
2195 2195