Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (1232 commits)
  iucv: Fix bad merging.
  net_sched: Add size table for qdiscs
  net_sched: Add accessor function for packet length for qdiscs
  net_sched: Add qdisc_enqueue wrapper
  highmem: Export totalhigh_pages.
  ipv6 mcast: Omit redundant address family checks in ip6_mc_source().
  net: Use standard structures for generic socket address structures.
  ipv6 netns: Make several "global" sysctl variables namespace aware.
  netns: Use net_eq() to compare net-namespaces for optimization.
  ipv6: remove unused macros from net/ipv6.h
  ipv6: remove unused parameter from ip6_ra_control
  tcp: fix kernel panic with listening_get_next
  tcp: Remove redundant checks when setting eff_sacks
  tcp: options clean up
  tcp: Fix MD5 signatures for non-linear skbs
  sctp: Update sctp global memory limit allocations.
  sctp: remove unnecessary byteshifting, calculate directly in big-endian
  sctp: Allow only 1 listening socket with SO_REUSEADDR
  sctp: Do not leak memory on multiple listen() calls
  sctp: Support ipv6only AF_INET6 sockets.
  ...

1 files changed, 59 insertions, 61 deletions

diff --git a/drivers/net/ixgb/ixgb_ethtool.c b/drivers/net/ixgb/ixgb_ethtool.c
index 8464d8a013b0..288ee1d0f431 100644
--- 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,
@@ -95,7 +95,7 @@ ixgb_get_settings(struct net_device *netdev, struct ethtool_cmd *ecmd)
         ecmd->port = PORT_FIBRE;
         ecmd->transceiver = XCVR_EXTERNAL;
 
-        if(netif_carrier_ok(adapter->netdev)) {
+        if (netif_carrier_ok(adapter->netdev)) {
                 ecmd->speed = SPEED_10000;
                 ecmd->duplex = DUPLEX_FULL;
         } else {
@@ -122,11 +122,11 @@ ixgb_set_settings(struct net_device *netdev, struct ethtool_cmd *ecmd)
 {
         struct ixgb_adapter *adapter = netdev_priv(netdev);
 
-        if(ecmd->autoneg == AUTONEG_ENABLE ||
+        if (ecmd->autoneg == AUTONEG_ENABLE ||
            ecmd->speed + ecmd->duplex != SPEED_10000 + DUPLEX_FULL)
                 return -EINVAL;
-        
-        if(netif_running(adapter->netdev)) {
+
+        if (netif_running(adapter->netdev)) {
                 ixgb_down(adapter, true);
                 ixgb_reset(adapter);
                 ixgb_up(adapter);
@@ -143,14 +143,14 @@ 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)
+
+        if (hw->fc.type == ixgb_fc_rx_pause)
                 pause->rx_pause = 1;
-        else if(hw->fc.type == ixgb_fc_tx_pause)
+        else if (hw->fc.type == ixgb_fc_tx_pause)
                 pause->tx_pause = 1;
-        else if(hw->fc.type == ixgb_fc_full) {
+        else if (hw->fc.type == ixgb_fc_full) {
                 pause->rx_pause = 1;
                 pause->tx_pause = 1;
         }
@@ -162,26 +162,26 @@ 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)
+
+        if (pause->autoneg == AUTONEG_ENABLE)
                 return -EINVAL;
 
-        if(pause->rx_pause && pause->tx_pause)
+        if (pause->rx_pause && pause->tx_pause)
                 hw->fc.type = ixgb_fc_full;
-        else if(pause->rx_pause && !pause->tx_pause)
+        else if (pause->rx_pause && !pause->tx_pause)
                 hw->fc.type = ixgb_fc_rx_pause;
-        else if(!pause->rx_pause && pause->tx_pause)
+        else if (!pause->rx_pause && pause->tx_pause)
                 hw->fc.type = ixgb_fc_tx_pause;
-        else if(!pause->rx_pause && !pause->tx_pause)
+        else if (!pause->rx_pause && !pause->tx_pause)
                 hw->fc.type = ixgb_fc_none;
 
-        if(netif_running(adapter->netdev)) {
+        if (netif_running(adapter->netdev)) {
                 ixgb_down(adapter, true);
                 ixgb_up(adapter);
                 ixgb_set_speed_duplex(netdev);
         } else
                 ixgb_reset(adapter);
-                
+
         return 0;
 }
 
@@ -200,7 +200,7 @@ ixgb_set_rx_csum(struct net_device *netdev, u32 data)
 
         adapter->rx_csum = data;
 
-        if(netif_running(netdev)) {
+        if (netif_running(netdev)) {
                 ixgb_down(adapter, true);
                 ixgb_up(adapter);
                 ixgb_set_speed_duplex(netdev);
@@ -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)
 {
@@ -229,12 +229,12 @@ ixgb_set_tx_csum(struct net_device *netdev, u32 data)
 static int
 ixgb_set_tso(struct net_device *netdev, u32 data)
 {
-        if(data)
+        if (data)
                 netdev->features |= NETIF_F_TSO;
         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 */
         }
@@ -415,7 +415,7 @@ ixgb_get_eeprom(struct net_device *netdev,
         int i, max_len, first_word, last_word;
         int ret_val = 0;
 
-        if(eeprom->len == 0) {
+        if (eeprom->len == 0) {
                 ret_val = -EINVAL;
                 goto geeprom_error;
         }
@@ -424,12 +424,12 @@ ixgb_get_eeprom(struct net_device *netdev,
 
         max_len = ixgb_get_eeprom_len(netdev);
 
-        if(eeprom->offset > eeprom->offset + eeprom->len) {
+        if (eeprom->offset > eeprom->offset + eeprom->len) {
                 ret_val = -EINVAL;
                 goto geeprom_error;
         }
 
-        if((eeprom->offset + eeprom->len) > max_len)
+        if ((eeprom->offset + eeprom->len) > max_len)
                 eeprom->len = (max_len - eeprom->offset);
 
         first_word = eeprom->offset >> 1;
@@ -437,16 +437,14 @@ ixgb_get_eeprom(struct net_device *netdev,
 
         eeprom_buff = kmalloc(sizeof(__le16) *
                         (last_word - first_word + 1), GFP_KERNEL);
-        if(!eeprom_buff)
+        if (!eeprom_buff)
                 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:
@@ -464,47 +462,47 @@ ixgb_set_eeprom(struct net_device *netdev,
         int max_len, first_word, last_word;
         u16 i;
 
-        if(eeprom->len == 0)
+        if (eeprom->len == 0)
                 return -EINVAL;
 
-        if(eeprom->magic != (hw->vendor_id | (hw->device_id << 16)))
+        if (eeprom->magic != (hw->vendor_id | (hw->device_id << 16)))
                 return -EFAULT;
 
         max_len = ixgb_get_eeprom_len(netdev);
 
-        if(eeprom->offset > eeprom->offset + eeprom->len)
+        if (eeprom->offset > eeprom->offset + eeprom->len)
                 return -EINVAL;
 
-        if((eeprom->offset + eeprom->len) > max_len)
+        if ((eeprom->offset + eeprom->len) > max_len)
                 eeprom->len = (max_len - eeprom->offset);
 
         first_word = eeprom->offset >> 1;
         last_word = (eeprom->offset + eeprom->len - 1) >> 1;
         eeprom_buff = kmalloc(max_len, GFP_KERNEL);
-        if(!eeprom_buff)
+        if (!eeprom_buff)
                 return -ENOMEM;
 
         ptr = (void *)eeprom_buff;
 
-        if(eeprom->offset & 1) {
+        if (eeprom->offset & 1) {
                 /* need read/modify/write of first changed EEPROM word */
                 /* only the second byte of the word is being modified */
                 eeprom_buff[0] = ixgb_read_eeprom(hw, first_word);
                 ptr++;
         }
-        if((eeprom->offset + eeprom->len) & 1) {
+        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 */
-        if(first_word <= EEPROM_CHECKSUM_REG)
+        if (first_word <= EEPROM_CHECKSUM_REG)
                 ixgb_update_eeprom_checksum(hw);
 
         kfree(eeprom_buff);
@@ -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)
 {
@@ -557,10 +555,10 @@ ixgb_set_ringparam(struct net_device *netdev,
         tx_old = adapter->tx_ring;
         rx_old = adapter->rx_ring;
 
-        if((ring->rx_mini_pending) || (ring->rx_jumbo_pending)) 
+        if ((ring->rx_mini_pending) || (ring->rx_jumbo_pending))
                 return -EINVAL;
 
-        if(netif_running(adapter->netdev))
+        if (netif_running(adapter->netdev))
                 ixgb_down(adapter, true);
 
         rxdr->count = max(ring->rx_pending,(u32)MIN_RXD);
@@ -571,11 +569,11 @@ ixgb_set_ringparam(struct net_device *netdev,
         txdr->count = min(txdr->count,(u32)MAX_TXD);
         txdr->count = ALIGN(txdr->count, IXGB_REQ_TX_DESCRIPTOR_MULTIPLE);
 
-        if(netif_running(adapter->netdev)) {
+        if (netif_running(adapter->netdev)) {
                 /* Try to get new resources before deleting old */
-                if((err = ixgb_setup_rx_resources(adapter)))
+                if ((err = ixgb_setup_rx_resources(adapter)))
                         goto err_setup_rx;
-                if((err = ixgb_setup_tx_resources(adapter)))
+                if ((err = ixgb_setup_tx_resources(adapter)))
                         goto err_setup_tx;
 
                 /* save the new, restore the old in order to free it,
@@ -589,7 +587,7 @@ ixgb_set_ringparam(struct net_device *netdev,
                 ixgb_free_tx_resources(adapter);
                 adapter->rx_ring = rx_new;
                 adapter->tx_ring = tx_new;
-                if((err = ixgb_up(adapter)))
+                if ((err = ixgb_up(adapter)))
                         return err;
                 ixgb_set_speed_duplex(netdev);
         }
@@ -615,7 +613,7 @@ ixgb_led_blink_callback(unsigned long data)
 {
         struct ixgb_adapter *adapter = (struct ixgb_adapter *)data;
 
-        if(test_and_change_bit(IXGB_LED_ON, &adapter->led_status))
+        if (test_and_change_bit(IXGB_LED_ON, &adapter->led_status))
                 ixgb_led_off(&adapter->hw);
         else
                 ixgb_led_on(&adapter->hw);
@@ -631,7 +629,7 @@ ixgb_phys_id(struct net_device *netdev, u32 data)
         if (!data)
                 data = INT_MAX;
 
-        if(!adapter->blink_timer.function) {
+        if (!adapter->blink_timer.function) {
                 init_timer(&adapter->blink_timer);
                 adapter->blink_timer.function = ixgb_led_blink_callback;
                 adapter->blink_timer.data = (unsigned long)adapter;
@@ -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);
                 }