aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorLinas Vepstas <linas@austin.ibm.com>2006-10-10 17:19:34 -0400
committerJeff Garzik <jeff@garzik.org>2006-10-11 04:04:27 -0400
commit66c097165cf6d4196e798145fb33c768164fb361 (patch)
tree4da337fe4c5eb0d86cc8867d06c916ec27d6e33a /drivers/net
parenta664ccf430547696951bf3949f5a2de5079ece5a (diff)
[PATCH] powerpc/cell spidernet variable name change
Cosmetic patch: give the variable holding the numer of descriptors a more descriptive name, so to avoid confusion. Signed-off-by: Linas Vepstas <linas@austin.ibm.com> Cc: James K Lewis <jklewis@us.ibm.com> Cc: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/spider_net.c12
-rw-r--r--drivers/net/spider_net.h4
-rw-r--r--drivers/net/spider_net_ethtool.c4
3 files changed, 10 insertions, 10 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
diff --git a/drivers/net/spider_net.h b/drivers/net/spider_net.h
index 1f5c9dc806a0..b3b46119b424 100644
--- a/drivers/net/spider_net.h
+++ b/drivers/net/spider_net.h
@@ -455,8 +455,8 @@ struct spider_net_card {
455 455
456 /* for ethtool */ 456 /* for ethtool */
457 int msg_enable; 457 int msg_enable;
458 int rx_desc; 458 int num_rx_desc;
459 int tx_desc; 459 int num_tx_desc;
460 struct spider_net_extra_stats spider_stats; 460 struct spider_net_extra_stats spider_stats;
461 461
462 struct spider_net_descr descr[0]; 462 struct spider_net_descr descr[0];
diff --git a/drivers/net/spider_net_ethtool.c b/drivers/net/spider_net_ethtool.c
index fda74f7d6fd6..91b995102915 100644
--- a/drivers/net/spider_net_ethtool.c
+++ b/drivers/net/spider_net_ethtool.c
@@ -158,9 +158,9 @@ spider_net_ethtool_get_ringparam(struct net_device *netdev,
158 struct spider_net_card *card = netdev->priv; 158 struct spider_net_card *card = netdev->priv;
159 159
160 ering->tx_max_pending = SPIDER_NET_TX_DESCRIPTORS_MAX; 160 ering->tx_max_pending = SPIDER_NET_TX_DESCRIPTORS_MAX;
161 ering->tx_pending = card->tx_desc; 161 ering->tx_pending = card->num_tx_desc;
162 ering->rx_max_pending = SPIDER_NET_RX_DESCRIPTORS_MAX; 162 ering->rx_max_pending = SPIDER_NET_RX_DESCRIPTORS_MAX;
163 ering->rx_pending = card->rx_desc; 163 ering->rx_pending = card->num_rx_desc;
164} 164}
165 165
166static int spider_net_get_stats_count(struct net_device *netdev) 166static int spider_net_get_stats_count(struct net_device *netdev)