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

* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (21 commits)
  [IPV4] SNMP: Support OutMcastPkts and OutBcastPkts
  [IPV4] SNMP: Support InMcastPkts and InBcastPkts
  [IPV4] SNMP: Support InTruncatedPkts
  [IPV4] SNMP: Support InNoRoutes
  [SNMP]: Add definitions for {In,Out}BcastPkts
  [TCP] FRTO: RFC4138 allows Nagle override when new data must be sent
  [TCP] FRTO: Delay skb available check until it's mandatory
  [XFRM]: Restrict upper layer information by bundle.
  [TCP]: Catch skb with S+L bugs earlier
  [PATCH] INET : IPV4 UDP lookups converted to a 2 pass algo
  [L2TP]: Add the ability to autoload a pppox protocol module.
  [SKB]: Introduce skb_queue_walk_safe()
  [AF_IUCV/IUCV]: smp_call_function deadlock
  [IPV6]: Fix slab corruption running ip6sic
  [TCP]: Update references in two old comments
  [XFRM]: Export SPD info
  [IPV6]: Track device renames in snmp6.
  [SCTP]: Fix sctp_getsockopt_local_addrs_old() to use local storage.
  [NET]: Remove NETIF_F_INTERNAL_STATS, default to internal stats.
  [NETPOLL]: Remove CONFIG_NETPOLL_RX
  ...

diff --combined drivers/net/Kconfig
index eb4b96c4d388a1623f5d6b454a3d82cad7475d7c,32a3003893d8893e272ae4aa5b8e4f34beb280c6..dcdad217df51ef439a695215177c1fd1a177274b
--- 1/drivers/net/Kconfig
--- 2/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@@ -486,8 -486,8 +486,8 @@@ config SGI_IOC3_ETH_HW_TX_CSU
          enables offloading for checksums on transmit.  If unsure, say Y.
  
  config MIPS_SIM_NET
 -      tristate "MIPS simulator Network device (EXPERIMENTAL)"
 -      depends on MIPS_SIM && EXPERIMENTAL
 +      tristate "MIPS simulator Network device"
 +      depends on NET_ETHERNET && MIPS_SIM
        help
          The MIPSNET device is a simple Ethernet network device which is
          emulated by the MIPS Simulator.
@@@ -1444,8 -1444,7 +1444,8 @@@ config CS89x
  
  config TC35815
        tristate "TOSHIBA TC35815 Ethernet support"
 -      depends on NET_PCI && PCI && TOSHIBA_JMR3927
 +      depends on NET_PCI && PCI && MIPS
 +      select MII
  
  config DGRS
        tristate "Digi Intl. RightSwitch SE-X support"
@@@ -2274,12 -2273,11 +2274,12 @@@ config GFAR_NAP
        depends on GIANFAR
  
  config UCC_GETH
 -      tristate "Freescale QE UCC GETH"
 -      depends on QUICC_ENGINE && UCC_FAST
 +      tristate "Freescale QE Gigabit Ethernet"
 +      depends on QUICC_ENGINE
 +      select UCC_FAST
        help
 -        This driver supports the Gigabit Ethernet mode of QE UCC.
 -        QE can be found on MPC836x CPUs.
 +        This driver supports the Gigabit Ethernet mode of the QUICC Engine,
 +        which is available on some Freescale SOCs.
  
  config UGETH_NAPI
        bool "NAPI Support"
@@@ -2293,10 -2291,14 +2293,10 @@@ config UGETH_FILTERIN
        bool "Mac address filtering support"
        depends on UCC_GETH
  
 -config UGETH_TX_ON_DEMOND
 -      bool "Transmit on Demond support"
 +config UGETH_TX_ON_DEMAND
 +      bool "Transmit on Demand support"
        depends on UCC_GETH
  
 -config UGETH_HAS_GIGA
 -      bool
 -      depends on UCC_GETH && PPC_MPC836x
 -
  config MV643XX_ETH
        tristate "MV-643XX Ethernet support"
        depends on MOMENCO_OCELOT_C || MOMENCO_JAGUAR_ATX || MV64360 || MOMENCO_OCELOT_3 || (PPC_MULTIPLATFORM && PPC32)
@@@ -2927,11 -2929,6 +2927,6 @@@ endif #NETDEVICE
  config NETPOLL
        def_bool NETCONSOLE
  
- config NETPOLL_RX
-       bool "Netpoll support for trapping incoming packets"
-       default n
-       depends on NETPOLL
- 
  config NETPOLL_TRAP
        bool "Netpoll traffic trapping"
        default n