1 files changed, 50 insertions, 1 deletions

diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig
index dbc10d84161f..e682b48e0709 100644
--- a/net/ipv4/Kconfig
+++ b/net/ipv4/Kconfig
@@ -309,8 +309,33 @@ config NET_IPVTI
 
 config NET_UDP_TUNNEL
         tristate
+        select NET_IP_TUNNEL
         default n
 
+config NET_FOU
+        tristate "IP: Foo (IP protocols) over UDP"
+        select XFRM
+        select NET_UDP_TUNNEL
+        ---help---
+          Foo over UDP allows any IP protocol to be directly encapsulated
+          over UDP include tunnels (IPIP, GRE, SIT). By encapsulating in UDP
+          network mechanisms and optimizations for UDP (such as ECMP
+          and RSS) can be leveraged to provide better service.
+
+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
@@ -560,6 +585,27 @@ config TCP_CONG_ILLINOIS
         For further details see:
           http://www.ews.uiuc.edu/~shaoliu/tcpillinois/index.html
 
+config TCP_CONG_DCTCP
+        tristate "DataCenter TCP (DCTCP)"
+        default n
+        ---help---
+        DCTCP leverages Explicit Congestion Notification (ECN) in the network to
+        provide multi-bit feedback to the end hosts. It is designed to provide:
+
+        - High burst tolerance (incast due to partition/aggregate),
+        - Low latency (short flows, queries),
+        - High throughput (continuous data updates, large file transfers) with
+          commodity, shallow-buffered switches.
+
+        All switches in the data center network running DCTCP must support
+        ECN marking and be configured for marking when reaching defined switch
+        buffer thresholds. The default ECN marking threshold heuristic for
+        DCTCP on switches is 20 packets (30KB) at 1Gbps, and 65 packets
+        (~100KB) at 10Gbps, but might need further careful tweaking.
+
+        For further details see:
+          http://simula.stanford.edu/~alizade/Site/DCTCP_files/dctcp-final.pdf
+
 choice
         prompt "Default TCP congestion control"
         default DEFAULT_CUBIC
@@ -588,9 +634,11 @@ choice
         config DEFAULT_WESTWOOD
                 bool "Westwood" if TCP_CONG_WESTWOOD=y
 
+        config DEFAULT_DCTCP
+                bool "DCTCP" if TCP_CONG_DCTCP=y
+
         config DEFAULT_RENO
                 bool "Reno"
-
 endchoice
 
 endif
@@ -610,6 +658,7 @@ config DEFAULT_TCP_CONG
         default "westwood" if DEFAULT_WESTWOOD
         default "veno" if DEFAULT_VENO
         default "reno" if DEFAULT_RENO
+        default "dctcp" if DEFAULT_DCTCP
         default "cubic"
 
 config TCP_MD5SIG