These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / net / ipv4 / Kconfig

diff --git a/kernel/net/ipv4/Kconfig b/kernel/net/ipv4/Kconfig
index bd29016..416dfa0 100644 (file)
--- a/kernel/net/ipv4/Kconfig
+++ b/kernel/net/ipv4/Kconfig
@@ -331,20 +331,6 @@ config NET_FOU_IP_TUNNELS
          When this option is enabled IP tunnels can be configured to use
          FOU or GUE encapsulation.
 
-config GENEVE
-       tristate "Generic Network Virtualization Encapsulation (Geneve)"
-       depends on INET
-       select NET_UDP_TUNNEL
-       ---help---
-       This allows one to create Geneve virtual interfaces that provide
-       Layer 2 Networks over Layer 3 Networks. Geneve is often used
-       to tunnel virtual network infrastructure in virtualized environments.
-       For more information see:
-         http://tools.ietf.org/html/draft-gross-geneve-01
-
-         To compile this driver as a module, choose M here: the module
-
-
 config INET_AH
        tristate "IP: AH transformation"
        select XFRM_ALGO
@@ -615,6 +601,22 @@ config TCP_CONG_DCTCP
        For further details see:
          http://simula.stanford.edu/~alizade/Site/DCTCP_files/dctcp-final.pdf
 
+config TCP_CONG_CDG
+       tristate "CAIA Delay-Gradient (CDG)"
+       default n
+       ---help---
+       CAIA Delay-Gradient (CDG) is a TCP congestion control that modifies
+       the TCP sender in order to:
+
+         o Use the delay gradient as a congestion signal.
+         o Back off with an average probability that is independent of the RTT.
+         o Coexist with flows that use loss-based congestion control.
+         o Tolerate packet loss unrelated to congestion.
+
+       For further details see:
+         D.A. Hayes and G. Armitage. "Revisiting TCP congestion control using
+         delay gradients." In Networking 2011. Preprint: http://goo.gl/No3vdg
+
 choice
        prompt "Default TCP congestion control"
        default DEFAULT_CUBIC
@@ -646,6 +648,9 @@ choice
        config DEFAULT_DCTCP
                bool "DCTCP" if TCP_CONG_DCTCP=y
 
+       config DEFAULT_CDG
+               bool "CDG" if TCP_CONG_CDG=y
+
        config DEFAULT_RENO
                bool "Reno"
 endchoice
@@ -668,6 +673,7 @@ config DEFAULT_TCP_CONG
        default "veno" if DEFAULT_VENO
        default "reno" if DEFAULT_RENO
        default "dctcp" if DEFAULT_DCTCP
+       default "cdg" if DEFAULT_CDG
        default "cubic"
 
 config TCP_MD5SIG