Merge branch 'master' of /home/cbou/linux-2.6

[linux-2.6] / drivers / net / ixgb / ixgb_ethtool.c

diff --git a/drivers/net/ixgb/ixgb_ethtool.c b/drivers/net/ixgb/ixgb_ethtool.c
index 7c9b35c677f074e8f2d1931194ad89ffb6c23773..288ee1d0f431e5659908bbd5ea2024c0f5266042 100644 (file)
--- a/drivers/net/ixgb/ixgb_ethtool.c
+++ b/drivers/net/ixgb/ixgb_ethtool.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel PRO/10GbE Linux driver
-  Copyright(c) 1999 - 2006 Intel Corporation.
+  Copyright(c) 1999 - 2008 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
@@ -125,7 +125,7 @@ ixgb_set_settings(struct net_device *netdev, struct ethtool_cmd *ecmd)
        if (ecmd->autoneg == AUTONEG_ENABLE ||
           ecmd->speed + ecmd->duplex != SPEED_10000 + DUPLEX_FULL)
                return -EINVAL;
-       
+
        if (netif_running(adapter->netdev)) {
                ixgb_down(adapter, true);
                ixgb_reset(adapter);
@@ -143,9 +143,9 @@ ixgb_get_pauseparam(struct net_device *netdev,
 {
        struct ixgb_adapter *adapter = netdev_priv(netdev);
        struct ixgb_hw *hw = &adapter->hw;
-       
+
        pause->autoneg = AUTONEG_DISABLE;
-               
+
        if (hw->fc.type == ixgb_fc_rx_pause)
                pause->rx_pause = 1;
        else if (hw->fc.type == ixgb_fc_tx_pause)
@@ -162,7 +162,7 @@ ixgb_set_pauseparam(struct net_device *netdev,
 {
        struct ixgb_adapter *adapter = netdev_priv(netdev);
        struct ixgb_hw *hw = &adapter->hw;
-       
+
        if (pause->autoneg == AUTONEG_ENABLE)
                return -EINVAL;
 
@@ -181,7 +181,7 @@ ixgb_set_pauseparam(struct net_device *netdev,
                ixgb_set_speed_duplex(netdev);
        } else
                ixgb_reset(adapter);
-               
+
        return 0;
 }
 
@@ -208,7 +208,7 @@ ixgb_set_rx_csum(struct net_device *netdev, u32 data)
                ixgb_reset(adapter);
        return 0;
 }
-       
+
 static u32
 ixgb_get_tx_csum(struct net_device *netdev)
 {
@@ -234,7 +234,7 @@ ixgb_set_tso(struct net_device *netdev, u32 data)
        else
                netdev->features &= ~NETIF_F_TSO;
        return 0;
-} 
+}
 
 static u32
 ixgb_get_msglevel(struct net_device *netdev)
@@ -251,7 +251,7 @@ ixgb_set_msglevel(struct net_device *netdev, u32 data)
 }
 #define IXGB_GET_STAT(_A_, _R_) _A_->stats._R_
 
-static int 
+static int
 ixgb_get_regs_len(struct net_device *netdev)
 {
 #define IXGB_REG_DUMP_LEN  136*sizeof(u32)
@@ -301,7 +301,7 @@ ixgb_get_regs(struct net_device *netdev,
        *reg++ = IXGB_READ_REG(hw, RXCSUM);     /*  20 */
 
        /* there are 16 RAR entries in hardware, we only use 3 */
-       for(i = 0; i < IXGB_ALL_RAR_ENTRIES; i++) {
+       for (i = 0; i < IXGB_ALL_RAR_ENTRIES; i++) {
                *reg++ = IXGB_READ_REG_ARRAY(hw, RAL, (i << 1)); /*21,...,51 */
                *reg++ = IXGB_READ_REG_ARRAY(hw, RAH, (i << 1)); /*22,...,52 */
        }
@@ -441,12 +441,10 @@ ixgb_get_eeprom(struct net_device *netdev,
                return -ENOMEM;
 
        /* note the eeprom was good because the driver loaded */
-       for(i = 0; i <= (last_word - first_word); i++) {
+       for (i = 0; i <= (last_word - first_word); i++)
                eeprom_buff[i] = ixgb_get_eeprom_word(hw, (first_word + i));
-       }
 
-       memcpy(bytes, (u8 *)eeprom_buff + (eeprom->offset & 1),
-                       eeprom->len);
+       memcpy(bytes, (u8 *)eeprom_buff + (eeprom->offset & 1), eeprom->len);
        kfree(eeprom_buff);
 
 geeprom_error:
@@ -495,12 +493,12 @@ ixgb_set_eeprom(struct net_device *netdev,
        if ((eeprom->offset + eeprom->len) & 1) {
                /* need read/modify/write of last changed EEPROM word */
                /* only the first byte of the word is being modified */
-               eeprom_buff[last_word - first_word] 
+               eeprom_buff[last_word - first_word]
                        = ixgb_read_eeprom(hw, last_word);
        }
 
        memcpy(ptr, bytes, eeprom->len);
-       for(i = 0; i <= (last_word - first_word); i++)
+       for (i = 0; i <= (last_word - first_word); i++)
                ixgb_write_eeprom(hw, first_word + i, eeprom_buff[i]);
 
        /* Update the checksum over the first part of the EEPROM if needed */
@@ -534,7 +532,7 @@ ixgb_get_ringparam(struct net_device *netdev,
        struct ixgb_desc_ring *txdr = &adapter->tx_ring;
        struct ixgb_desc_ring *rxdr = &adapter->rx_ring;
 
-       ring->rx_max_pending = MAX_RXD; 
+       ring->rx_max_pending = MAX_RXD;
        ring->tx_max_pending = MAX_TXD;
        ring->rx_mini_max_pending = 0;
        ring->rx_jumbo_max_pending = 0;
@@ -544,7 +542,7 @@ ixgb_get_ringparam(struct net_device *netdev,
        ring->rx_jumbo_pending = 0;
 }
 
-static int 
+static int
 ixgb_set_ringparam(struct net_device *netdev,
                struct ethtool_ringparam *ring)
 {
@@ -647,7 +645,7 @@ ixgb_phys_id(struct net_device *netdev, u32 data)
        return 0;
 }
 
-static int 
+static int
 ixgb_get_sset_count(struct net_device *netdev, int sset)
 {
        switch (sset) {
@@ -658,30 +656,30 @@ ixgb_get_sset_count(struct net_device *netdev, int sset)
        }
 }
 
-static void 
-ixgb_get_ethtool_stats(struct net_device *netdev, 
+static void
+ixgb_get_ethtool_stats(struct net_device *netdev,
                struct ethtool_stats *stats, u64 *data)
 {
        struct ixgb_adapter *adapter = netdev_priv(netdev);
        int i;
 
        ixgb_update_stats(adapter);
-       for(i = 0; i < IXGB_STATS_LEN; i++) {
-               char *p = (char *)adapter+ixgb_gstrings_stats[i].stat_offset;   
-               data[i] = (ixgb_gstrings_stats[i].sizeof_stat == 
+       for (i = 0; i < IXGB_STATS_LEN; i++) {
+               char *p = (char *)adapter+ixgb_gstrings_stats[i].stat_offset;
+               data[i] = (ixgb_gstrings_stats[i].sizeof_stat ==
                        sizeof(u64)) ? *(u64 *)p : *(u32 *)p;
        }
 }
 
-static void 
+static void
 ixgb_get_strings(struct net_device *netdev, u32 stringset, u8 *data)
 {
        int i;
 
        switch(stringset) {
        case ETH_SS_STATS:
-               for(i=0; i < IXGB_STATS_LEN; i++) {
-                       memcpy(data + i * ETH_GSTRING_LEN, 
+               for (i = 0; i < IXGB_STATS_LEN; i++) {
+                       memcpy(data + i * ETH_GSTRING_LEN,
                        ixgb_gstrings_stats[i].stat_string,
                        ETH_GSTRING_LEN);
                }