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)
         }
 
         /* 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;
 
         /* 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;
         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;
 
         card->low_watermark = NULL;
 
         /* rx_chain is after tx_chain, so offset is descr + tx_count */
         if (spider_net_init_chain(card, &card->rx_chain,
-                        card->descr + card->tx_desc,
-                        PCI_DMA_FROMDEVICE, card->rx_desc))
+                        card->descr + card->num_tx_desc,
+                        PCI_DMA_FROMDEVICE, card->num_rx_desc))
                 goto alloc_rx_failed;
 
         /* 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->tx_desc = tx_descriptors;
-        card->rx_desc = rx_descriptors;
+        card->num_tx_desc = tx_descriptors;
+        card->num_rx_desc = rx_descriptors;
 
         spider_net_setup_netdev_ops(netdev);
 
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 {
 
         /* for ethtool */
         int msg_enable;
-        int rx_desc;
-        int tx_desc;
+        int num_rx_desc;
+        int num_tx_desc;
         struct spider_net_extra_stats spider_stats;
 
         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,
         struct spider_net_card *card = netdev->priv;
 
         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_pending = card->rx_desc;
+        ering->rx_pending = card->num_rx_desc;
 }
 
 static int spider_net_get_stats_count(struct net_device *netdev)