projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] s2io: Switch to pci_get_device
[powerpc.git]
/
drivers
/
net
/
spider_net.c
diff --git
a/drivers/net/spider_net.c
b/drivers/net/spider_net.c
index
647f62e
..
8890721
100644
(file)
--- a/
drivers/net/spider_net.c
+++ b/
drivers/net/spider_net.c
@@
-1611,13
+1611,12
@@
spider_net_open(struct net_device *netdev)
int result;
result = -ENOMEM;
int result;
result = -ENOMEM;
- if (spider_net_init_chain(card, &card->tx_chain,
- card->descr,
- PCI_DMA_TODEVICE, tx_descriptors))
+ if (spider_net_init_chain(card, &card->tx_chain, card->descr,
+ PCI_DMA_TODEVICE, card->tx_desc))
goto alloc_tx_failed;
if (spider_net_init_chain(card, &card->rx_chain,
goto alloc_tx_failed;
if (spider_net_init_chain(card, &card->rx_chain,
- card->descr +
tx_descriptors
,
- PCI_DMA_FROMDEVICE,
rx_descriptors
))
+ card->descr +
card->rx_desc
,
+ PCI_DMA_FROMDEVICE,
card->rx_desc
))
goto alloc_rx_failed;
/* allocate rx skbs */
goto alloc_rx_failed;
/* allocate rx skbs */
@@
-2005,6
+2004,9
@@
spider_net_setup_netdev(struct spider_net_card *card)
card->options.rx_csum = SPIDER_NET_RX_CSUM_DEFAULT;
card->options.rx_csum = SPIDER_NET_RX_CSUM_DEFAULT;
+ card->tx_desc = tx_descriptors;
+ card->rx_desc = rx_descriptors;
+
spider_net_setup_netdev_ops(netdev);
netdev->features = NETIF_F_HW_CSUM | NETIF_F_LLTX;
spider_net_setup_netdev_ops(netdev);
netdev->features = NETIF_F_HW_CSUM | NETIF_F_LLTX;