summaryrefslogtreecommitdiffstats
path: root/net/Makefile
diff options
context:
space:
mode:
authorJames Chapman <jchapman@katalix.com>2010-04-02 06:18:33 +0000
committerDavid S. Miller <davem@davemloft.net>2010-04-03 14:56:02 -0700
commitfd558d186df2c13a22455373858bae634a4795af (patch)
treeed05523913473b6ba7658c6e8d72a1642cce1851 /net/Makefile
parent21b4aaa14329db793832e865f15000c5c0192ac3 (diff)
downloadlinux-fd558d186df2c13a22455373858bae634a4795af.tar.gz
linux-fd558d186df2c13a22455373858bae634a4795af.tar.bz2
linux-fd558d186df2c13a22455373858bae634a4795af.zip
l2tp: Split pppol2tp patch into separate l2tp and ppp parts
This patch splits the pppol2tp driver into separate L2TP and PPP parts to prepare for L2TPv3 support. In L2TPv3, protocols other than PPP can be carried, so this split creates a common L2TP core that will handle the common L2TP bits which protocol support modules such as PPP will use. Note that the existing pppol2tp module is split into l2tp_core and l2tp_ppp by this change. There are no feature changes here. Internally, however, there are significant changes, mostly to handle the separation of PPP-specific data from the L2TP session and to provide hooks in the core for modules like PPP to access. Signed-off-by: James Chapman <jchapman@katalix.com> Reviewed-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/Makefile')
-rw-r--r--net/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/Makefile b/net/Makefile
index 13ca77e0eb08..cb7bdc1210cb 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -40,7 +40,7 @@ obj-$(CONFIG_BT) += bluetooth/
obj-$(CONFIG_SUNRPC) += sunrpc/
obj-$(CONFIG_AF_RXRPC) += rxrpc/
obj-$(CONFIG_ATM) += atm/
-obj-$(CONFIG_PPPOL2TP) += l2tp/
+obj-$(CONFIG_L2TP) += l2tp/
obj-$(CONFIG_DECNET) += decnet/
obj-$(CONFIG_ECONET) += econet/
obj-$(CONFIG_PHONET) += phonet/