1 files changed, 74 insertions, 0 deletions

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 39189903e355..6f388d9e9bea 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -1411,6 +1411,22 @@ config FORCEDETH
           <file:Documentation/networking/net-modules.txt>.  The module will be
           called forcedeth.
 
+config FORCEDETH_NAPI
+        bool "Use Rx and Tx Polling (NAPI) (EXPERIMENTAL)"
+        depends on FORCEDETH && EXPERIMENTAL
+        help
+          NAPI is a new driver API designed to reduce CPU and interrupt load
+          when the driver is receiving lots of packets from the card. It is
+          still somewhat experimental and thus not yet enabled by default.
+
+          If your estimated Rx load is 10kpps or more, or if the card will be
+          deployed on potentially unfriendly networks (e.g. in a firewall),
+          then say Y here.
+
+          See <file:Documentation/networking/NAPI_HOWTO.txt> for more
+          information.
+
+          If in doubt, say N.
 
 config CS89x0
         tristate "CS89x0 support"
@@ -1724,6 +1740,20 @@ config VIA_RHINE_MMIO
 
           If unsure, say Y.
 
+config VIA_RHINE_NAPI
+        bool "Use Rx Polling (NAPI)"
+        depends on VIA_RHINE
+        help
+          NAPI is a new driver API designed to reduce CPU and interrupt load
+          when the driver is receiving lots of packets from the card.
+
+          If your estimated Rx load is 10kpps or more, or if the card will be
+          deployed on potentially unfriendly networks (e.g. in a firewall),
+          then say Y here.
+
+          See <file:Documentation/networking/NAPI_HOWTO.txt> for more
+          information.
+
 config LAN_SAA9730
         bool "Philips SAA9730 Ethernet support (EXPERIMENTAL)"
         depends on NET_PCI && EXPERIMENTAL && MIPS
@@ -2219,6 +2249,33 @@ config GFAR_NAPI
         bool "NAPI Support"
         depends on GIANFAR
 
+config UCC_GETH
+        tristate "Freescale QE UCC GETH"
+        depends on QUICC_ENGINE && UCC_FAST
+        help
+          This driver supports the Gigabit Ethernet mode of QE UCC.
+          QE can be found on MPC836x CPUs.
+
+config UGETH_NAPI
+        bool "NAPI Support"
+        depends on UCC_GETH
+
+config UGETH_MAGIC_PACKET
+        bool "Magic Packet detection support"
+        depends on UCC_GETH
+
+config UGETH_FILTERING
+        bool "Mac address filtering support"
+        depends on UCC_GETH
+
+config UGETH_TX_ON_DEMOND
+        bool "Transmit on Demond support"
+        depends on UCC_GETH
+
+config UGETH_HAS_GIGA
+        bool
+        depends on UCC_GETH && MPC836x
+
 config MV643XX_ETH
         tristate "MV-643XX Ethernet support"
         depends on MOMENCO_OCELOT_C || MOMENCO_JAGUAR_ATX || MV64360 || MOMENCO_OCELOT_3 || PPC_MULTIPLATFORM
@@ -2249,6 +2306,15 @@ config MV643XX_ETH_2
           This enables support for Port 2 of the Marvell MV643XX Gigabit
           Ethernet.
 
+config QLA3XXX
+        tristate "QLogic QLA3XXX Network Driver Support"
+        depends on PCI
+        help
+          This driver supports QLogic ISP3XXX gigabit Ethernet cards.
+
+          To compile this driver as a module, choose M here: the module
+          will be called qla3xxx.
+
 endmenu
 
 #
@@ -2509,6 +2575,7 @@ config PLIP
 
 config PPP
         tristate "PPP (point-to-point protocol) support"
+        select SLHC
         ---help---
           PPP (Point to Point Protocol) is a newer and better SLIP.  It serves
           the same purpose: sending Internet traffic over telephone (and other
@@ -2689,6 +2756,7 @@ config SLIP
 config SLIP_COMPRESSED
         bool "CSLIP compressed headers"
         depends on SLIP
+        select SLHC
         ---help---
           This protocol is faster than SLIP because it uses compression on the
           TCP/IP headers (not on the data itself), but it has to be supported
@@ -2701,6 +2769,12 @@ config SLIP_COMPRESSED
           <http://www.tldp.org/docs.html#howto>, explains how to configure
           CSLIP. This won't enlarge your kernel.
 
+config SLHC
+        tristate
+        help
+          This option enables Van Jacobsen serial line header compression
+          routines.
+
 config SLIP_SMART
         bool "Keepalive and linefill"
         depends on SLIP