Merge branch 'master' of /repos/git/net-next-2.6

[pandora-kernel.git] / net / ipv4 / Kconfig

diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig
index 7cd7760..8949a05 100644 (file)
--- a/net/ipv4/Kconfig
+++ b/net/ipv4/Kconfig
@@ -84,7 +84,7 @@ config IP_FIB_TRIE
 
          An experimental study of compression methods for dynamic tries
          Stefan Nilsson and Matti Tikkanen. Algorithmica, 33(1):19-33, 2002.
-         http://www.nada.kth.se/~snilsson/public/papers/dyntrie2/
+         <http://www.csc.kth.se/~snilsson/software/dyntrie2/>
 
 endchoice
 
@@ -140,6 +140,9 @@ config IP_ROUTE_VERBOSE
          handled by the klogd daemon which is responsible for kernel messages
          ("man klogd").
 
+config IP_ROUTE_CLASSID
+       bool
+
 config IP_PNP
        bool "IP: kernel level autoconfiguration"
        help
@@ -215,9 +218,15 @@ config NET_IPIP
          be inserted in and removed from the running kernel whenever you
          want). Most people won't need this and can say N.
 
+config NET_IPGRE_DEMUX
+       tristate "IP: GRE demultiplexer"
+       help
+        This is helper module to demultiplex GRE packets on GRE version field criteria.
+        Required by ip_gre and pptp modules.
+
 config NET_IPGRE
        tristate "IP: GRE tunnels over IP"
-       depends on IPV6 || IPV6=n
+       depends on (IPV6 || IPV6=n) && NET_IPGRE_DEMUX
        help
          Tunneling means encapsulating data of one protocol type within
          another protocol and sending it over a channel that understands the
@@ -426,7 +435,9 @@ config INET_DIAG
        ---help---
          Support for INET (TCP, DCCP, etc) socket monitoring interface used by
          native Linux tools such as ss. ss is included in iproute2, currently
-         downloadable at <http://linux-net.osdl.org/index.php/Iproute2>.
+         downloadable at:
+         
+           http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2
 
          If unsure, say Y.
 
@@ -556,7 +567,7 @@ config TCP_CONG_VENO
        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
+       See <http://ieeexplore.ieee.org/xpl/freeabs_all.jsp?arnumber=1177186> 
 
 config TCP_CONG_YEAH
        tristate "YeAH TCP"
@@ -649,4 +660,3 @@ config TCP_MD5SIG
          on the Internet.
 
          If unsure, say N.
-