netxen: sanitize variable names

o remove max_ prefix from ring sizes, since they don't really
  represent max possible sizes.
o cleanup naming of rx ring types (normal, jumbo, lro).
o simplify logic to choose rx ring size, gig ports get half
  rx ring of 10 gig ports.

Signed-off-by: Dhananjay Phadke <dhananjay@netxen.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/net/netxen/netxen_nic_ethtool.c b/drivers/net/netxen/netxen_nic_ethtool.c
index 8b4bdfd6a117..a677ff895184 100644
--- a/drivers/net/netxen/netxen_nic_ethtool.c
+++ b/drivers/net/netxen/netxen_nic_ethtool.c
@@ -477,10 +477,10 @@ netxen_nic_get_ringparam(struct net_device *dev, struct ethtool_ringparam *ring)
         ring->rx_pending = 0;
         ring->rx_jumbo_pending = 0;
         ring->rx_pending += adapter->recv_ctx.
-                rds_rings[RCV_DESC_NORMAL_CTXID].max_rx_desc_count;
+                rds_rings[RCV_RING_NORMAL].num_desc;
         ring->rx_jumbo_pending += adapter->recv_ctx.
-                rds_rings[RCV_DESC_JUMBO_CTXID].max_rx_desc_count;
-        ring->tx_pending = adapter->max_tx_desc_count;
+                rds_rings[RCV_RING_JUMBO].num_desc;
+        ring->tx_pending = adapter->num_txd;
 
         if (adapter->ahw.port_type == NETXEN_NIC_GBE)
                 ring->rx_max_pending = MAX_RCV_DESCRIPTORS_1G;