Merge branch 'kvm-updates/2.6.35' of git://git.kernel.org/pub/scm/virt/kvm/kvm

[karo-tx-linux.git] / net / l2tp / Kconfig

diff --git a/net/l2tp/Kconfig b/net/l2tp/Kconfig
index d60758d60478906ab12ca9de1bba2a09e0563292..4b1e71751e1019de005ed9f4f8a9708f2c11f158 100644 (file)
--- a/net/l2tp/Kconfig
+++ b/net/l2tp/Kconfig
@@ -31,6 +31,19 @@ menuconfig L2TP
          If you don't need L2TP, say N. To compile all L2TP code as
          modules, choose M here.
 
+config L2TP_DEBUGFS
+       tristate "L2TP debugfs support"
+       depends on L2TP && DEBUG_FS
+       help
+         Support for l2tp directory in debugfs filesystem. This may be
+         used to dump internal state of the l2tp drivers for problem
+         analysis.
+
+         If unsure, say 'Y'.
+
+         To compile this driver as a module, choose M here. The module
+         will be called l2tp_debugfs.
+
 config L2TP_V3
        bool "L2TPv3 support (EXPERIMENTAL)"
        depends on EXPERIMENTAL && L2TP
@@ -51,3 +64,44 @@ config L2TP_V3
          If you are connecting to L2TPv3 equipment, or you want to
          tunnel raw ethernet frames using L2TP, say Y here. If
          unsure, say N.
+
+config L2TP_IP
+       tristate "L2TP IP encapsulation for L2TPv3"
+       depends on L2TP_V3
+       help
+         Support for L2TP-over-IP socket family.
+
+         The L2TPv3 protocol defines two possible encapsulations for
+         L2TP frames, namely UDP and plain IP (without UDP). This
+         driver provides a new L2TPIP socket family with which
+         userspace L2TPv3 daemons may create L2TP/IP tunnel sockets
+         when UDP encapsulation is not required. When L2TP is carried
+         in IP packets, it used IP protocol number 115, so this port
+         must be enabled in firewalls.
+
+         To compile this driver as a module, choose M here. The module
+         will be called l2tp_ip.
+
+config L2TP_ETH
+       tristate "L2TP ethernet pseudowire support for L2TPv3"
+       depends on L2TP_V3
+       help
+         Support for carrying raw ethernet frames over L2TPv3.
+
+         From RFC 4719 <http://www.ietf.org/rfc/rfc4719.txt>.
+
+         The Layer 2 Tunneling Protocol, Version 3 (L2TPv3) can be
+         used as a control protocol and for data encapsulation to set
+         up Pseudowires for transporting layer 2 Packet Data Units
+         across an IP network [RFC3931].
+
+         This driver provides an ethernet virtual interface for each
+         L2TP ethernet pseudowire instance. Standard Linux tools may
+         be used to assign an IP address to the local virtual
+         interface, or add the interface to a bridge.
+
+         If you are using L2TPv3, you will almost certainly want to
+         enable this option.
+
+         To compile this driver as a module, choose M here. The module
+         will be called l2tp_eth.