[PATCH] NetXen: multiport firmware support, ioctl interface

NetXen: 1G/10G Ethernet driver updates
	- Multiport and newer firmware support
	- ioctl interface for user level tools
	- Cast error fix for multiport

Signed-off-by: Amit S. Kale <amitkale@netxen.com>

 netxen_nic.h          |  281 +++++++++++++++++++++++++-------
 netxen_nic_ethtool.c  |   12 -
 netxen_nic_hw.c       |  429 +++++++++++++++++++++++++++++++++++++++++---------
 netxen_nic_init.c     |  301 ++++++++++++++++++++++++++++++-----
 netxen_nic_ioctl.h    |    2
 netxen_nic_isr.c      |    3
 netxen_nic_main.c     |  260 ++++++++++++++++++------------
 netxen_nic_niu.c      |   22 +-
 netxen_nic_phan_reg.h |  228 ++++++++++++++++----------
 9 files changed, 1161 insertions(+), 377 deletions(-)
Signed-off-by: Jeff Garzik <jeff@garzik.org>

1 files changed, 7 insertions, 5 deletions

diff --git a/drivers/net/netxen/netxen_nic_ethtool.c b/drivers/net/netxen/netxen_nic_ethtool.c
index c7fcbf345db9..2ab4885cc950 100644
--- a/drivers/net/netxen/netxen_nic_ethtool.c
+++ b/drivers/net/netxen/netxen_nic_ethtool.c
@@ -459,20 +459,22 @@ netxen_nic_get_ringparam(struct net_device *dev, struct ethtool_ringparam *ring)
 {
         struct netxen_port *port = netdev_priv(dev);
         struct netxen_adapter *adapter = port->adapter;
-        int i, j;
+        int i;
 
         ring->rx_pending = 0;
+        ring->rx_jumbo_pending = 0;
         for (i = 0; i < MAX_RCV_CTX; ++i) {
-                for (j = 0; j < NUM_RCV_DESC_RINGS; j++)
-                        ring->rx_pending +=
-                            adapter->recv_ctx[i].rcv_desc[j].rcv_pending;
+                ring->rx_pending += adapter->recv_ctx[i].
+                    rcv_desc[RCV_DESC_NORMAL_CTXID].rcv_pending;
+                ring->rx_jumbo_pending += adapter->recv_ctx[i].
+                    rcv_desc[RCV_DESC_JUMBO_CTXID].rcv_pending;
         }
 
         ring->rx_max_pending = adapter->max_rx_desc_count;
         ring->tx_max_pending = adapter->max_tx_desc_count;
+        ring->rx_jumbo_max_pending = adapter->max_jumbo_rx_desc_count;
         ring->rx_mini_max_pending = 0;
         ring->rx_mini_pending = 0;
-        ring->rx_jumbo_max_pending = 0;
         ring->rx_jumbo_pending = 0;
 }