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: (29 commits)
  tcp: Restore ordering of TCP options for the sake of inter-operability
  net: Fix disjunct computation of netdev features
  sctp: Fix to handle SHUTDOWN in SHUTDOWN_RECEIVED state
  sctp: Fix to handle SHUTDOWN in SHUTDOWN-PENDING state
  sctp: Add check for the TSN field of the SHUTDOWN chunk
  sctp: Drop ICMP packet too big message with MTU larger than current PMTU
  p54: enable 2.4/5GHz spectrum by eeprom bits.
  orinoco: reduce stack usage in firmware download path
  ath5k: fix suspend-related oops on rmmod
  [netdrvr] fec_mpc52xx: Implement polling, to make netconsole work.
  qlge: Fix MSI/legacy single interrupt bug.
  smc911x: Make the driver safer on SMP
  smc911x: Add IRQ polarity configuration
  smc911x: Allow Kconfig dependency on ARM
  sis190: add identifier for Atheros AR8021 PHY
  8139x: reduce message severity on driver overlap
  igb: add IGB_DCA instead of selecting INTEL_IOATDMA
  igb: fix tx data corruption with transition to L0s on 82575
  ehea: Fix memory hotplug support
  netdev: DM9000: remove BLACKFIN hacking in DM9000 netdev driver
  ...

diff --combined drivers/net/Kconfig
index 0b71ebc074b68cc1bd90c50b185e8d6a0eb74956,a76ca75fd4d3360ae258a79848258c99dcb9d200..f749b40f954e65e7ed5965320749c8261e76842e
--- 1/drivers/net/Kconfig
--- 2/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@@ -464,12 -464,6 +464,12 @@@ config MIPS_JAZZ_SONI
          This is the driver for the onboard card of MIPS Magnum 4000,
          Acer PICA, Olivetti M700-10 and a few other identical OEM systems.
  
 +config XTENSA_XT2000_SONIC
 +      tristate "Xtensa XT2000 onboard SONIC Ethernet support"
 +      depends on XTENSA_PLATFORM_XT2000
 +      help
 +        This is the driver for the onboard card of the Xtensa XT2000 board.
 +
  config MIPS_AU1X00_ENET
        bool "MIPS AU1000 Ethernet support"
        depends on SOC_AU1X00
@@@ -894,7 -888,7 +894,7 @@@ config SMC91
        select CRC32
        select MII
        depends on ARM || REDWOOD_5 || REDWOOD_6 || M32R || SUPERH || \
-               SOC_AU1X00 || BLACKFIN || MN10300
+               MIPS || BLACKFIN || MN10300
        help
          This is a driver for SMC's 91x series of Ethernet chipsets,
          including the SMC91C94 and the SMC91C111. Say Y if you want it
@@@ -966,7 -960,7 +966,7 @@@ config SMC911
        tristate "SMSC LAN911[5678] support"
        select CRC32
        select MII
-       depends on ARCH_PXA || SUPERH
+       depends on ARM || SUPERH
        help
          This is a driver for SMSC's LAN911x series of Ethernet chipsets
          including the new LAN9115, LAN9116, LAN9117, and LAN9118.
@@@ -2009,6 -2003,11 +2009,11 @@@ config IGB_LR
  
          If in doubt, say N.
  
+ config IGB_DCA
+       bool "Enable DCA"
+       default y
+       depends on IGB && DCA && !(IGB=y && DCA=m)
+ 
  source "drivers/net/ixp2000/Kconfig"
  
  config MYRI_SBUS
@@@ -2510,15 -2509,6 +2515,15 @@@ config PASEMI_MA
          This driver supports the on-chip 1/10Gbit Ethernet controller on
          PA Semi's PWRficient line of chips.
  
 +config MLX4_EN
 +      tristate "Mellanox Technologies 10Gbit Ethernet support"
 +      depends on PCI && INET
 +      select MLX4_CORE
 +      select INET_LRO
 +      help
 +        This driver supports Mellanox Technologies ConnectX Ethernet
 +        devices.
 +
  config MLX4_CORE
        tristate
        depends on PCI