Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq

[linux-2.6] / drivers / net / Kconfig

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index c748b0e1641921b195d5df144ae0addba10eb3b3..1958d9e16a3aaaa606541ee56173b5811a286c5c 100644 (file)
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -475,6 +475,14 @@ config SGI_IOC3_ETH_HW_TX_CSUM
          the moment only acceleration of IPv4 is supported.  This option
          enables offloading for checksums on transmit.  If unsure, say Y.
 
          the moment only acceleration of IPv4 is supported.  This option
          enables offloading for checksums on transmit.  If unsure, say Y.
 

+config MIPS_SIM_NET
+       tristate "MIPS simulator Network device (EXPERIMENTAL)"
+       depends on NETDEVICES && MIPS_SIM && EXPERIMENTAL
+       help
+         The MIPSNET device is a simple Ethernet network device which is
+         emulated by the MIPS Simulator.
+         If you are not using a MIPSsim or are unsure, say N.
+

 config SGI_O2MACE_ETH
        tristate "SGI O2 MACE Fast Ethernet support"
        depends on NET_ETHERNET && SGI_IP32=y
 config SGI_O2MACE_ETH
        tristate "SGI O2 MACE Fast Ethernet support"
        depends on NET_ETHERNET && SGI_IP32=y


@@ -1155,38 +1163,74 @@ config IBMVETH
          be called ibmveth.
 
 config IBM_EMAC
          be called ibmveth.
 
 config IBM_EMAC

-       bool "IBM PPC4xx EMAC driver support"
+       tristate "PowerPC 4xx on-chip Ethernet support"

        depends on 4xx
        depends on 4xx

-       select CRC32
-       ---help---
-         This driver supports the IBM PPC4xx EMAC family of on-chip
-         Ethernet controllers.
-
-config IBM_EMAC_ERRMSG
-       bool "Verbose error messages"
-       depends on IBM_EMAC && BROKEN
+       help
+         This driver supports the PowerPC 4xx EMAC family of on-chip
+          Ethernet controllers.

 
 config IBM_EMAC_RXB
        int "Number of receive buffers"
        depends on IBM_EMAC
 
 config IBM_EMAC_RXB
        int "Number of receive buffers"
        depends on IBM_EMAC

-       default "128" if IBM_EMAC4
-       default "64"
+       default "128"

 
 config IBM_EMAC_TXB
        int "Number of transmit buffers"
        depends on IBM_EMAC
 
 config IBM_EMAC_TXB
        int "Number of transmit buffers"
        depends on IBM_EMAC

-       default "128" if IBM_EMAC4
-       default "8"
+       default "64"

 
 

-config IBM_EMAC_FGAP
-       int "Frame gap"
+config IBM_EMAC_POLL_WEIGHT
+       int "MAL NAPI polling weight"

        depends on IBM_EMAC
        depends on IBM_EMAC

-       default "8"
+       default "32"

 
 

-config IBM_EMAC_SKBRES
-       int "Skb reserve amount"
+config IBM_EMAC_RX_COPY_THRESHOLD
+       int "RX skb copy threshold (bytes)"
+       depends on IBM_EMAC
+       default "256"
+
+config IBM_EMAC_RX_SKB_HEADROOM
+       int "Additional RX skb headroom (bytes)"

        depends on IBM_EMAC
        default "0"
        depends on IBM_EMAC
        default "0"

+       help
+         Additional receive skb headroom. Note, that driver
+         will always reserve at least 2 bytes to make IP header
+         aligned, so usualy there is no need to add any additional
+         headroom.
+         
+         If unsure, set to 0.
+
+config IBM_EMAC_PHY_RX_CLK_FIX
+       bool "PHY Rx clock workaround"
+       depends on IBM_EMAC && (405EP || 440GX || 440EP || 440GR)
+       help
+         Enable this if EMAC attached to a PHY which doesn't generate
+         RX clock if there is no link, if this is the case, you will 
+         see "TX disable timeout" or "RX disable timeout" in the system
+         log.
+         
+         If unsure, say N.
+
+config IBM_EMAC_DEBUG
+       bool "Debugging"
+       depends on IBM_EMAC
+       default n
+
+config IBM_EMAC_ZMII
+       bool
+       depends on IBM_EMAC && (NP405H || NP405L || 44x)
+       default y
+
+config IBM_EMAC_RGMII
+       bool
+       depends on IBM_EMAC && 440GX
+       default y
+               
+config IBM_EMAC_TAH
+       bool
+       depends on IBM_EMAC && 440GX
+       default y

 
 config NET_PCI
        bool "EISA, VLB, PCI and on board controllers"
 
 config NET_PCI
        bool "EISA, VLB, PCI and on board controllers"


@@ -1767,6 +1811,7 @@ config NE_H8300
          controller on the Renesas H8/300 processor.
 
 source "drivers/net/fec_8xx/Kconfig"
          controller on the Renesas H8/300 processor.
 
 source "drivers/net/fec_8xx/Kconfig"

+source "drivers/net/fs_enet/Kconfig"

 
 endmenu
 
 
 endmenu
 


@@ -2083,6 +2128,7 @@ config SPIDER_NET
 config GIANFAR
        tristate "Gianfar Ethernet"
        depends on 85xx || 83xx
 config GIANFAR
        tristate "Gianfar Ethernet"
        depends on 85xx || 83xx

+       select PHYLIB

        help
          This driver supports the Gigabit TSEC on the MPC85xx 
          family of chips, and the FEC on the 8540
        help
          This driver supports the Gigabit TSEC on the MPC85xx 
          family of chips, and the FEC on the 8540


@@ -2192,8 +2238,8 @@ config S2IO
        depends on PCI
        ---help---
          This driver supports the 10Gbe XFrame NIC of S2IO. 
        depends on PCI
        ---help---
          This driver supports the 10Gbe XFrame NIC of S2IO. 

-         For help regarding driver compilation, installation and 
-         tuning please look into ~/drivers/net/s2io/README.txt.
+         More specific information on configuring the driver is in 
+         <file:Documentation/networking/s2io.txt>.

 
 config S2IO_NAPI
        bool "Use Rx Polling (NAPI) (EXPERIMENTAL)"
 
 config S2IO_NAPI
        bool "Use Rx Polling (NAPI) (EXPERIMENTAL)"


@@ -2212,17 +2258,6 @@ config S2IO_NAPI
 
          If in doubt, say N.
 
 
          If in doubt, say N.
 

-config 2BUFF_MODE
-       bool "Use 2 Buffer Mode on Rx side."
-       depends on S2IO
-       ---help---
-       On enabling the 2 buffer mode, the received frame will be
-       split into 2 parts before being DMA'ed to the hosts memory.
-       The parts are the ethernet header and ethernet payload. 
-       This is useful on systems where DMA'ing to to unaligned 
-       physical memory loactions comes with a heavy price.
-       If not sure please say N.
-

 endmenu
 
 if !UML
 endmenu
 
 if !UML


@@ -2243,6 +2278,20 @@ config ISERIES_VETH
        tristate "iSeries Virtual Ethernet driver support"
        depends on PPC_ISERIES
 
        tristate "iSeries Virtual Ethernet driver support"
        depends on PPC_ISERIES
 

+config RIONET
+       tristate "RapidIO Ethernet over messaging driver support"
+       depends on NETDEVICES && RAPIDIO
+
+config RIONET_TX_SIZE
+       int "Number of outbound queue entries"
+       depends on RIONET
+       default "128"
+
+config RIONET_RX_SIZE
+       int "Number of inbound queue entries"
+       depends on RIONET
+       default "128"
+

 config FDDI
        bool "FDDI driver support"
        depends on (PCI || EISA)
 config FDDI
        bool "FDDI driver support"
        depends on (PCI || EISA)