summaryrefslogtreecommitdiffstats
path: root/net/l2tp/Makefile
diff options
context:
space:
mode:
authorJames Chapman <jchapman@katalix.com>2010-04-02 06:19:00 +0000
committerDavid S. Miller <davem@davemloft.net>2010-04-03 14:56:04 -0700
commit0d76751fad7739014485ba5bd388d4f1b4fd4143 (patch)
tree25a4525bf6b2ec9f052f22ba98cdfd3ff3a86aa3 /net/l2tp/Makefile
parente0d4435f93905f517003cfa7328a36ea19788147 (diff)
downloadlinux-0d76751fad7739014485ba5bd388d4f1b4fd4143.tar.gz
linux-0d76751fad7739014485ba5bd388d4f1b4fd4143.tar.bz2
linux-0d76751fad7739014485ba5bd388d4f1b4fd4143.zip
l2tp: Add L2TPv3 IP encapsulation (no UDP) support
This patch adds a new L2TPIP socket family and modifies the core to handle the case where there is no UDP header in the L2TP packet. L2TP/IP uses IP protocol 115. Since L2TP/UDP and L2TP/IP packets differ in layout, the datapath packet handling code needs changes too. Userspace uses an L2TPIP socket instead of a UDP socket when IP encapsulation is required. We can't use raw sockets for this because the semantics of raw sockets don't lend themselves to the socket-per-tunnel model - we need to Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/l2tp/Makefile')
-rw-r--r--net/l2tp/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/l2tp/Makefile b/net/l2tp/Makefile
index c91f208b1693..ef28b16f7d6a 100644
--- a/net/l2tp/Makefile
+++ b/net/l2tp/Makefile
@@ -6,3 +6,4 @@ obj-$(CONFIG_L2TP) += l2tp_core.o
# Build l2tp as modules if L2TP is M
obj-$(subst y,$(CONFIG_L2TP),$(CONFIG_PPPOL2TP)) += l2tp_ppp.o
+obj-$(subst y,$(CONFIG_L2TP),$(CONFIG_L2TP_IP)) += l2tp_ip.o