Skip to contentSkip to conversation

l2tp: move pppol2tp to net/l2tp

RFC PATCH In review James Chapman 1 participant 1 message Feb 22, 2009

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

RFC PATCH 1/8 l2tp: move pppol2tp to net/l2tp

This patch moves the existing pppol2tp driver from drivers/net into a new net/l2tp directory, which is where the upcoming L2TPv3 code will live. The existing CONFIG_PPPOL2TP config option is left in its current place to avoid "make oldconfig" issues when an existing pppol2tp user takes this change. (This is the same approach used for the pppoatm driver, which moved from drivers/net to net/atm a long time ago.)

There are no code changes. The existing drivers/net/pppol2tp.c is simply moved to net/l2tp.

drivers/net/Makefile +1 -1
Index: net-next-2.6-l2tpv3-2/drivers/net/Makefile
===================================================================
@@ -141,7 +141,7 @@ obj-$(CONFIG_PPP_DEFLATE) += ppp_deflate
 obj-$(CONFIG_PPP_BSDCOMP) += bsd_comp.o
 obj-$(CONFIG_PPP_MPPE) += ppp_mppe.o
 obj-$(CONFIG_PPPOE) += pppox.o pppoe.o
-obj-$(CONFIG_PPPOL2TP) += pppox.o pppol2tp.o
+obj-$(CONFIG_PPPOL2TP) += pppox.o
 
 obj-$(CONFIG_SLIP) += slip.o
 obj-$(CONFIG_SLHC) += slhc.o
drivers/net/pppol2tp.c deleted +0 -2695

2,695 lines not on this page · raw message

net/l2tp/Makefile new file +5 -0
Index: net-next-2.6-l2tpv3-2/net/l2tp/Makefile
===================================================================
@@ -0,0 +1,5 @@
+#
+# Makefile for the L2TP.
+#
+
+obj-$(CONFIG_PPPOL2TP) += pppol2tp.o
net/l2tp/pppol2tp.c new file +2589 -0

292 lines not on this page · raw message

net/Kconfig +1 -0
Index: net-next-2.6-l2tpv3-2/net/Kconfig
===================================================================

Lines of this file are not shown. View the raw message.

net/Makefile +1 -0
Index: net-next-2.6-l2tpv3-2/net/Makefile
===================================================================

Lines of this file are not shown. View the raw message.

net/l2tp/Kconfig new file +3 -0
Index: net-next-2.6-l2tpv3-2/net/l2tp/Kconfig
===================================================================

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

Part of the diff is not shown here. View the raw message.