Merge commit '900cfa46191a7d87cf1891924cb90499287fd235'; branches 'timers/nohz',...

[linux-2.6-omap-h63xx.git] / drivers / net / netxen / netxen_nic_ethtool.c

diff --git a/drivers/net/netxen/netxen_nic_ethtool.c b/drivers/net/netxen/netxen_nic_ethtool.c
index cfb847b0cae3e44d9ead99eb2b49492954f22e33..723487bf200cb3b612b71521252e3a065bf30635 100644 (file)
--- a/drivers/net/netxen/netxen_nic_ethtool.c
+++ b/drivers/net/netxen/netxen_nic_ethtool.c
@@ -64,15 +64,7 @@ static const struct netxen_nic_stats netxen_nic_gstrings_stats[] = {
        {"bad_skb_len", NETXEN_NIC_STAT(stats.badskblen)},
        {"no_cmd_desc", NETXEN_NIC_STAT(stats.nocmddescriptor)},
        {"polled", NETXEN_NIC_STAT(stats.polled)},
-       {"uphappy", NETXEN_NIC_STAT(stats.uphappy)},
-       {"updropped", NETXEN_NIC_STAT(stats.updropped)},
-       {"uplcong", NETXEN_NIC_STAT(stats.uplcong)},
-       {"uphcong", NETXEN_NIC_STAT(stats.uphcong)},
-       {"upmcong", NETXEN_NIC_STAT(stats.upmcong)},
-       {"updunno", NETXEN_NIC_STAT(stats.updunno)},
-       {"skb_freed", NETXEN_NIC_STAT(stats.skbfreed)},
        {"tx_dropped", NETXEN_NIC_STAT(stats.txdropped)},
-       {"tx_null_skb", NETXEN_NIC_STAT(stats.txnullskb)},
        {"csummed", NETXEN_NIC_STAT(stats.csummed)},
        {"no_rcv", NETXEN_NIC_STAT(stats.no_rcv)},
        {"rx_bytes", NETXEN_NIC_STAT(stats.rxbytes)},
@@ -86,7 +78,7 @@ static const char netxen_nic_gstrings_test[][ETH_GSTRING_LEN] = {
        "Link_Test_on_offline"
 };
 
-#define NETXEN_NIC_TEST_LEN sizeof(netxen_nic_gstrings_test) / ETH_GSTRING_LEN
+#define NETXEN_NIC_TEST_LEN    ARRAY_SIZE(netxen_nic_gstrings_test)
 
 #define NETXEN_NIC_REGS_COUNT 42
 #define NETXEN_NIC_REGS_LEN (NETXEN_NIC_REGS_COUNT * sizeof(__le32))
@@ -377,7 +369,7 @@ netxen_nic_get_regs(struct net_device *dev, struct ethtool_regs *regs, void *p)
                for (i = 3; niu_registers[mode].reg[i - 3] != -1; i++) {
                        /* GB: port specific registers */
                        if (mode == 0 && i >= 19)
-                               window = physical_port[adapter->portnum] *
+                               window = adapter->physical_port *
                                        NETXEN_NIC_PORT_WINDOW;
 
                        NETXEN_NIC_LOCKED_READ_REG(niu_registers[mode].
@@ -423,11 +415,11 @@ netxen_nic_get_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom,
        if (eeprom->len == 0)
                return -EINVAL;
 
-       eeprom->magic = (adapter->pdev)->vendor | 
+       eeprom->magic = (adapter->pdev)->vendor |
                        ((adapter->pdev)->device << 16);
        offset = eeprom->offset;
 
-       ret = netxen_rom_fast_read_words(adapter, offset, bytes, 
+       ret = netxen_rom_fast_read_words(adapter, offset, bytes,
                                                eeprom->len);
        if (ret < 0)
                return ret;
@@ -453,16 +445,16 @@ netxen_nic_set_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom,
                                netxen_nic_driver_name);
                        return ret;
                }
-               printk(KERN_INFO "%s: flash unlocked. \n", 
+               printk(KERN_INFO "%s: flash unlocked. \n",
                        netxen_nic_driver_name);
                last_schedule_time = jiffies;
                ret = netxen_flash_erase_secondary(adapter);
                if (ret != FLASH_SUCCESS) {
-                       printk(KERN_ERR "%s: Flash erase failed.\n", 
+                       printk(KERN_ERR "%s: Flash erase failed.\n",
                                netxen_nic_driver_name);
                        return ret;
                }
-               printk(KERN_INFO "%s: secondary flash erased successfully.\n", 
+               printk(KERN_INFO "%s: secondary flash erased successfully.\n",
                        netxen_nic_driver_name);
                flash_start = 1;
                return 0;
@@ -471,7 +463,7 @@ netxen_nic_set_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom,
        if (offset == NETXEN_BOOTLD_START) {
                ret = netxen_flash_erase_primary(adapter);
                if (ret != FLASH_SUCCESS) {
-                       printk(KERN_ERR "%s: Flash erase failed.\n", 
+                       printk(KERN_ERR "%s: Flash erase failed.\n",
                                netxen_nic_driver_name);
                        return ret;
                }
@@ -483,16 +475,16 @@ netxen_nic_set_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom,
                if (ret != FLASH_SUCCESS)
                        return ret;
 
-               printk(KERN_INFO "%s: primary flash erased successfully\n", 
+               printk(KERN_INFO "%s: primary flash erased successfully\n",
                        netxen_nic_driver_name);
 
                ret = netxen_backup_crbinit(adapter);
                if (ret != FLASH_SUCCESS) {
-                       printk(KERN_ERR "%s: CRBinit backup failed.\n", 
+                       printk(KERN_ERR "%s: CRBinit backup failed.\n",
                                netxen_nic_driver_name);
                        return ret;
                }
-               printk(KERN_INFO "%s: CRBinit backup done.\n", 
+               printk(KERN_INFO "%s: CRBinit backup done.\n",
                        netxen_nic_driver_name);
                ready_to_flash = 1;
        }
@@ -535,7 +527,7 @@ netxen_nic_get_pauseparam(struct net_device *dev,
 {
        struct netxen_adapter *adapter = netdev_priv(dev);
        __u32 val;
-       int port = physical_port[adapter->portnum];
+       int port = adapter->physical_port;
 
        if (adapter->ahw.board_type == NETXEN_NIC_GBE) {
                if ((port < 0) || (port > NETXEN_NIU_MAX_GBE_PORTS))
@@ -570,7 +562,7 @@ netxen_nic_get_pauseparam(struct net_device *dev,
                else
                        pause->tx_pause = !(netxen_xg_get_xg1_mask(val));
        } else {
-               printk(KERN_ERR"%s: Unknown board type: %x\n", 
+               printk(KERN_ERR"%s: Unknown board type: %x\n",
                                netxen_nic_driver_name, adapter->ahw.board_type);
        }
 }
@@ -581,7 +573,7 @@ netxen_nic_set_pauseparam(struct net_device *dev,
 {
        struct netxen_adapter *adapter = netdev_priv(dev);
        __u32 val;
-       int port = physical_port[adapter->portnum];
+       int port = adapter->physical_port;
        /* read mode */
        if (adapter->ahw.board_type == NETXEN_NIC_GBE) {
                if ((port < 0) || (port > NETXEN_NIU_MAX_GBE_PORTS))
@@ -589,7 +581,7 @@ netxen_nic_set_pauseparam(struct net_device *dev,
                /* set flow control */
                netxen_nic_read_w0(adapter,
                                        NETXEN_NIU_GB_MAC_CONFIG_0(port), &val);
-               
+
                if (pause->rx_pause)
                        netxen_gb_rx_flowctl(val);
                else
@@ -642,10 +634,10 @@ netxen_nic_set_pauseparam(struct net_device *dev,
                        else
                                netxen_xg_set_xg1_mask(val);
                }
-               netxen_nic_write_w0(adapter, NETXEN_NIU_XG_PAUSE_CTL, val);                     
+               netxen_nic_write_w0(adapter, NETXEN_NIU_XG_PAUSE_CTL, val);
        } else {
                printk(KERN_ERR "%s: Unknown board type: %x\n",
-                               netxen_nic_driver_name, 
+                               netxen_nic_driver_name,
                                adapter->ahw.board_type);
        }
        return 0;