Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 66c09716 authored by Linas Vepstas's avatar Linas Vepstas Committed by Jeff Garzik
Browse files

[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: default avatarLinas Vepstas <linas@austin.ibm.com>
Cc: James K Lewis <jklewis@us.ibm.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent a664ccf4

drivers/net/spider_net.c

+6 −6
Original line number Original line Diff line number Diff line
@@ -718,7 +718,7 @@ spider_net_set_low_watermark(struct spider_net_card *card) 
	}

	}





	/* If TX queue is short, don't even bother with interrupts */

	/* If TX queue is short, don't even bother with interrupts */

	if (cnt < card->tx_desc/4)

	if (cnt < card->num_tx_desc/4)

		return cnt;

		return cnt;





	/* Set low-watermark 3/4th's of the way into the queue. */

	/* Set low-watermark 3/4th's of the way into the queue. */
@@ -1666,15 +1666,15 @@ spider_net_open(struct net_device *netdev) 




	result = -ENOMEM;

	result = -ENOMEM;

	if (spider_net_init_chain(card, &card->tx_chain, card->descr,

	if (spider_net_init_chain(card, &card->tx_chain, card->descr,

			PCI_DMA_TODEVICE, card->tx_desc))

			PCI_DMA_TODEVICE, card->num_tx_desc))

		goto alloc_tx_failed;

		goto alloc_tx_failed;





	card->low_watermark = NULL;

	card->low_watermark = NULL;





	/* rx_chain is after tx_chain, so offset is descr + tx_count */

	/* rx_chain is after tx_chain, so offset is descr + tx_count */

	if (spider_net_init_chain(card, &card->rx_chain,

	if (spider_net_init_chain(card, &card->rx_chain,

			card->descr + card->tx_desc,

			card->descr + card->num_tx_desc,

			PCI_DMA_FROMDEVICE, card->rx_desc))

			PCI_DMA_FROMDEVICE, card->num_rx_desc))

		goto alloc_rx_failed;

		goto alloc_rx_failed;





	/* allocate rx skbs */

	/* allocate rx skbs */
@@ -2060,8 +2060,8 @@ 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->num_tx_desc = tx_descriptors;

	card->rx_desc = rx_descriptors;

	card->num_rx_desc = rx_descriptors;





	spider_net_setup_netdev_ops(netdev);

	spider_net_setup_netdev_ops(netdev);

drivers/net/spider_net.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -455,8 +455,8 @@ struct spider_net_card { 




	/* for ethtool */

	/* for ethtool */

	int msg_enable;

	int msg_enable;

	int rx_desc;

	int num_rx_desc;

	int tx_desc;

	int num_tx_desc;

	struct spider_net_extra_stats spider_stats;

	struct spider_net_extra_stats spider_stats;





	struct spider_net_descr descr[0];

	struct spider_net_descr descr[0];

drivers/net/spider_net_ethtool.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -158,9 +158,9 @@ spider_net_ethtool_get_ringparam(struct net_device *netdev, 
	struct spider_net_card *card = netdev->priv;

	struct spider_net_card *card = netdev->priv;





	ering->tx_max_pending = SPIDER_NET_TX_DESCRIPTORS_MAX;

	ering->tx_max_pending = SPIDER_NET_TX_DESCRIPTORS_MAX;

	ering->tx_pending = card->tx_desc;

	ering->tx_pending = card->num_tx_desc;

	ering->rx_max_pending = SPIDER_NET_RX_DESCRIPTORS_MAX;

	ering->rx_max_pending = SPIDER_NET_RX_DESCRIPTORS_MAX;

	ering->rx_pending = card->rx_desc;

	ering->rx_pending = card->num_rx_desc;

}

}





static int spider_net_get_stats_count(struct net_device *netdev)

static int spider_net_get_stats_count(struct net_device *netdev)