aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/spider_net.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/spider_net.c')
-rw-r--r--drivers/net/spider_net.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/spider_net.c b/drivers/net/spider_net.c
index caa11c6f21b9..88e7e41adec1 100644
--- a/drivers/net/spider_net.c
+++ b/drivers/net/spider_net.c
@@ -718,7 +718,7 @@ spider_net_set_low_watermark(struct spider_net_card *card)
718 } 718 }
719 719
720 /* If TX queue is short, don't even bother with interrupts */ 720 /* If TX queue is short, don't even bother with interrupts */
721 if (cnt < card->tx_desc/4) 721 if (cnt < card->num_tx_desc/4)
722 return cnt; 722 return cnt;
723 723
724 /* Set low-watermark 3/4th's of the way into the queue. */ 724 /* Set low-watermark 3/4th's of the way into the queue. */
@@ -1666,15 +1666,15 @@ spider_net_open(struct net_device *netdev)
1666 1666
1667 result = -ENOMEM; 1667 result = -ENOMEM;
1668 if (spider_net_init_chain(card, &card->tx_chain, card->descr, 1668 if (spider_net_init_chain(card, &card->tx_chain, card->descr,
1669 PCI_DMA_TODEVICE, card->tx_desc)) 1669 PCI_DMA_TODEVICE, card->num_tx_desc))
1670 goto alloc_tx_failed; 1670 goto alloc_tx_failed;
1671 1671
1672 card->low_watermark = NULL; 1672 card->low_watermark = NULL;
1673 1673
1674 /* rx_chain is after tx_chain, so offset is descr + tx_count */ 1674 /* rx_chain is after tx_chain, so offset is descr + tx_count */
1675 if (spider_net_init_chain(card, &card->rx_chain, 1675 if (spider_net_init_chain(card, &card->rx_chain,
1676 card->descr + card->tx_desc, 1676 card->descr + card->num_tx_desc,
1677 PCI_DMA_FROMDEVICE, card->rx_desc)) 1677 PCI_DMA_FROMDEVICE, card->num_rx_desc))
1678 goto alloc_rx_failed; 1678 goto alloc_rx_failed;
1679 1679
1680 /* allocate rx skbs */ 1680 /* allocate rx skbs */
@@ -2060,8 +2060,8 @@ spider_net_setup_netdev(struct spider_net_card *card)
2060 2060
2061 card->options.rx_csum = SPIDER_NET_RX_CSUM_DEFAULT; 2061 card->options.rx_csum = SPIDER_NET_RX_CSUM_DEFAULT;
2062 2062
2063 card->tx_desc = tx_descriptors; 2063 card->num_tx_desc = tx_descriptors;
2064 card->rx_desc = rx_descriptors; 2064 card->num_rx_desc = rx_descriptors;
2065 2065
2066 spider_net_setup_netdev_ops(netdev); 2066 spider_net_setup_netdev_ops(netdev);
2067 2067