summaryrefslogtreecommitdiffstats
path: root/net/l2tp/Makefile
diff options
context:
space:
mode:
authorChris Elston <celston@katalix.com>2012-04-29 21:48:54 +0000
committerDavid S. Miller <davem@davemloft.net>2012-05-01 09:30:55 -0400
commita32e0eec7042b21ccb52896cf715e3e2641fed93 (patch)
tree12880271e8f5fb4c5e48a0633e9a38d5a67a3448 /net/l2tp/Makefile
parenta495f8364efe11f4813914b09cf0d026364d6969 (diff)
downloadlinux-stable-a32e0eec7042b21ccb52896cf715e3e2641fed93.tar.gz
linux-stable-a32e0eec7042b21ccb52896cf715e3e2641fed93.tar.bz2
linux-stable-a32e0eec7042b21ccb52896cf715e3e2641fed93.zip
l2tp: introduce L2TPv3 IP encapsulation support for IPv6
L2TPv3 defines an IP encapsulation packet format where data is carried directly over IP (no UDP). The kernel already has support for L2TP IP encapsulation over IPv4 (l2tp_ip). This patch introduces support for L2TP IP encapsulation over IPv6. The implementation is derived from ipv6/raw and ipv4/l2tp_ip. Signed-off-by: Chris Elston <celston@katalix.com> Signed-off-by: James Chapman <jchapman@katalix.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/l2tp/Makefile')
-rw-r--r--net/l2tp/Makefile3
1 files changed, 3 insertions, 0 deletions
diff --git a/net/l2tp/Makefile b/net/l2tp/Makefile
index 110e7bc2de5e..2870f41ea44d 100644
--- a/net/l2tp/Makefile
+++ b/net/l2tp/Makefile
@@ -10,3 +10,6 @@ obj-$(subst y,$(CONFIG_L2TP),$(CONFIG_L2TP_IP)) += l2tp_ip.o
obj-$(subst y,$(CONFIG_L2TP),$(CONFIG_L2TP_V3)) += l2tp_netlink.o
obj-$(subst y,$(CONFIG_L2TP),$(CONFIG_L2TP_ETH)) += l2tp_eth.o
obj-$(subst y,$(CONFIG_L2TP),$(CONFIG_L2TP_DEBUGFS)) += l2tp_debugfs.o
+ifneq ($(CONFIG_IPV6),)
+obj-$(subst y,$(CONFIG_L2TP),$(CONFIG_L2TP_IP)) += l2tp_ip6.o
+endif