X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=net%2Fipv4%2FKconfig;fp=net%2Fipv4%2FKconfig;h=011cca7ae02bee12f4cd61c609a9105b06a5b23e;hb=64ba3f394c830ec48a1c31b53dcae312c56f1604;hp=8514106761b0ce6637b3fde1ead4af203d43e9d1;hpb=be1e6109ac94a859551f8e1774eb9a8469fe055c;p=linux-2.6.git

diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig
index 851410676..011cca7ae 100644
--- a/net/ipv4/Kconfig
+++ b/net/ipv4/Kconfig
@@ -235,7 +235,6 @@ config IP_PNP_RARP
 #   bool '    IP: ARP support' CONFIG_IP_PNP_ARP		
 config NET_IPIP
 	tristate "IP: tunneling"
-	select INET_TUNNEL
 	---help---
 	  Tunneling means encapsulating data of one protocol type within
 	  another protocol and sending it over a channel that understands the
@@ -396,7 +395,7 @@ config INET_ESP
 config INET_IPCOMP
 	tristate "IP: IPComp transformation"
 	select XFRM
-	select INET_XFRM_TUNNEL
+	select INET_TUNNEL
 	select CRYPTO
 	select CRYPTO_DEFLATE
 	---help---
@@ -405,31 +404,13 @@ config INET_IPCOMP
 	  
 	  If unsure, say Y.
 
-config INET_XFRM_TUNNEL
-	tristate
-	select INET_TUNNEL
-	default n
-
 config INET_TUNNEL
-	tristate
-	default n
-
-config INET_XFRM_MODE_TRANSPORT
-	tristate "IP: IPsec transport mode"
-	default y
-	select XFRM
-	---help---
-	  Support for IPsec transport mode.
-
-	  If unsure, say Y.
-
-config INET_XFRM_MODE_TUNNEL
-	tristate "IP: IPsec tunnel mode"
-	default y
+	tristate "IP: tunnel transformation"
 	select XFRM
 	---help---
-	  Support for IPsec tunnel mode.
-
+	  Support for generic IP tunnel transformation, which is required by
+	  the IP tunneling module as well as tunnel mode IPComp.
+	  
 	  If unsure, say Y.
 
 config INET_DIAG
@@ -550,28 +531,6 @@ config TCP_CONG_SCALABLE
 	properties, though is known to have fairness issues.
 	See http://www-lce.eng.cam.ac.uk/~ctk21/scalable/
 
-config TCP_CONG_LP
-	tristate "TCP Low Priority"
-	depends on EXPERIMENTAL
-	default n
-	---help---
-	TCP Low Priority (TCP-LP), a distributed algorithm whose goal is
-	to utiliza only the excess network bandwidth as compared to the
-	``fair share`` of bandwidth as targeted by TCP.
-	See http://www-ece.rice.edu/networks/TCP-LP/
-
-config TCP_CONG_VENO
-	tristate "TCP Veno"
-	depends on EXPERIMENTAL
-	default n
-	---help---
-	TCP Veno is a sender-side only enhancement of TCP to obtain better
-	throughput over wireless networks. TCP Veno makes use of state
-	distinguishing to circumvent the difficult judgment of the packet loss
-	type. TCP Veno cuts down less congestion window in response to random
-	loss packets.
-	See http://www.ntu.edu.sg/home5/ZHOU0022/papers/CPFu03a.pdf
-
 endmenu
 
 config TCP_CONG_BIC