Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 66c097165cf6d4196e798145fb33c768164fb361

Authored by Linas Vepstas
Committed by Jeff Garzik
1 parent a664ccf430
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[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>

Showing 3 changed files with 10 additions and 10 deletions Side-by-side Diff

drivers/net/spider_net.c
Diff comments   View file @ 66c0971
... ... @@ -718,7 +718,7 @@
718 718 }
719 719  
720 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 722 return cnt;
723 723  
724 724 /* Set low-watermark 3/4th's of the way into the queue. */
725 725  
... ... @@ -1666,15 +1666,15 @@
1666 1666  
1667 1667 result = -ENOMEM;
1668 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 1670 goto alloc_tx_failed;
1671 1671  
1672 1672 card->low_watermark = NULL;
1673 1673  
1674 1674 /* rx_chain is after tx_chain, so offset is descr + tx_count */
1675 1675 if (spider_net_init_chain(card, &card->rx_chain,
1676   - card->descr + card->tx_desc,
1677   - PCI_DMA_FROMDEVICE, card->rx_desc))
  1676 + card->descr + card->num_tx_desc,
  1677 + PCI_DMA_FROMDEVICE, card->num_rx_desc))
1678 1678 goto alloc_rx_failed;
1679 1679  
1680 1680 /* allocate rx skbs */
... ... @@ -2060,8 +2060,8 @@
2060 2060  
2061 2061 card->options.rx_csum = SPIDER_NET_RX_CSUM_DEFAULT;
2062 2062  
2063   - card->tx_desc = tx_descriptors;
2064   - card->rx_desc = rx_descriptors;
  2063 + card->num_tx_desc = tx_descriptors;
  2064 + card->num_rx_desc = rx_descriptors;
2065 2065  
2066 2066 spider_net_setup_netdev_ops(netdev);
2067 2067  
drivers/net/spider_net.h
Diff comments   View file @ 66c0971
... ... @@ -455,8 +455,8 @@
455 455  
456 456 /* for ethtool */
457 457 int msg_enable;
458   - int rx_desc;
459   - int tx_desc;
  458 + int num_rx_desc;
  459 + int num_tx_desc;
460 460 struct spider_net_extra_stats spider_stats;
461 461  
462 462 struct spider_net_descr descr[0];
drivers/net/spider_net_ethtool.c
Diff comments   View file @ 66c0971
... ... @@ -158,9 +158,9 @@
158 158 struct spider_net_card *card = netdev->priv;
159 159  
160 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 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  
166 166 static int spider_net_get_stats_count(struct net_device *netdev)