diff options
Diffstat (limited to 'drivers/net/spider_net.c')
| -rw-r--r-- | drivers/net/spider_net.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/net/spider_net.c b/drivers/net/spider_net.c index ec1a8e2d458e..d64e718afbd2 100644 --- a/drivers/net/spider_net.c +++ b/drivers/net/spider_net.c | |||
| @@ -1611,13 +1611,12 @@ spider_net_open(struct net_device *netdev) | |||
| 1611 | int result; | 1611 | int result; |
| 1612 | 1612 | ||
| 1613 | result = -ENOMEM; | 1613 | result = -ENOMEM; |
| 1614 | if (spider_net_init_chain(card, &card->tx_chain, | 1614 | if (spider_net_init_chain(card, &card->tx_chain, card->descr, |
| 1615 | card->descr, | 1615 | PCI_DMA_TODEVICE, card->tx_desc)) |
| 1616 | PCI_DMA_TODEVICE, tx_descriptors)) | ||
| 1617 | goto alloc_tx_failed; | 1616 | goto alloc_tx_failed; |
| 1618 | if (spider_net_init_chain(card, &card->rx_chain, | 1617 | if (spider_net_init_chain(card, &card->rx_chain, |
| 1619 | card->descr + tx_descriptors, | 1618 | card->descr + card->rx_desc, |
| 1620 | PCI_DMA_FROMDEVICE, rx_descriptors)) | 1619 | PCI_DMA_FROMDEVICE, card->rx_desc)) |
| 1621 | goto alloc_rx_failed; | 1620 | goto alloc_rx_failed; |
| 1622 | 1621 | ||
| 1623 | /* allocate rx skbs */ | 1622 | /* allocate rx skbs */ |
| @@ -2005,6 +2004,9 @@ spider_net_setup_netdev(struct spider_net_card *card) | |||
| 2005 | 2004 | ||
| 2006 | card->options.rx_csum = SPIDER_NET_RX_CSUM_DEFAULT; | 2005 | card->options.rx_csum = SPIDER_NET_RX_CSUM_DEFAULT; |
| 2007 | 2006 | ||
| 2007 | card->tx_desc = tx_descriptors; | ||
| 2008 | card->rx_desc = rx_descriptors; | ||
| 2009 | |||
| 2008 | spider_net_setup_netdev_ops(netdev); | 2010 | spider_net_setup_netdev_ops(netdev); |
| 2009 | 2011 | ||
| 2010 | netdev->features = NETIF_F_HW_CSUM | NETIF_F_LLTX; | 2012 | netdev->features = NETIF_F_HW_CSUM | NETIF_F_LLTX; |
