X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=net%2FKconfig;h=435e535ead8c168d3cb3efbecbad1363702b8e8d;hb=6a77f38946aaee1cd85eeec6cf4229b204c15071;hp=cae135013a82bfa8276a07e96f9ec71915fa6c3e;hpb=87fc8d1bb10cd459024a742c6a10961fefcef18f;p=linux-2.6.git

diff --git a/net/Kconfig b/net/Kconfig
index cae135013..435e535ea 100644
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -219,6 +219,10 @@ source "net/bridge/netfilter/Kconfig"
 
 endif
 
+config XFRM
+       bool
+       depends on NET
+
 source "net/xfrm/Kconfig"
 
 source "net/sctp/Kconfig"
@@ -564,24 +568,6 @@ config WAN_ROUTER
 
 	  If unsure, say N.
 
-config NET_HW_FLOWCONTROL
-	bool "Forwarding between high speed interfaces"
-	depends on EXPERIMENTAL
-	---help---
-	  This option enables NIC (Network Interface Card) hardware throttling
-	  during periods of extreme congestion. At the moment only a couple
-	  of device drivers support it (really only one -- tulip, a modified
-	  8390 driver can be found at
-	  <ftp://ftp.tux.org/pub/net/ip-routing/fastroute/fastroute-8390.tar.gz>).
-
-	  Really, this option is applicable to any machine attached to a fast
-	  enough network, and even a 10 Mb NIC is able to kill a not very slow
-	  box, such as a 120MHz Pentium.
-
-	  However, do not say Y here if you did not experience any serious
-	  problems.
-
-
 menu "QoS and/or fair queueing"
 
 config NET_SCHED
@@ -635,7 +621,7 @@ config NET_PKTGEN
 	  stress testing and performance analysis.  If you don't understand
 	  what was just said, you don't need it: say N.
 
-	  Documentation on how to use the packet generaor can be found
+	  Documentation on how to use the packet generator can be found
 	  at <file:Documentation/networking/pktgen.txt>.
 
 	  To compile this code as a module, choose M here: the