Skip to content

Commit 21b4aaa

Browse files
j-c-hdavem330
authored andcommitted
l2tp: Relocate pppol2tp driver to new net/l2tp directory
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 to net/atm.) There are no code changes. The existing drivers/net/pppol2tp.c is simply moved to net/l2tp. Signed-off-by: James Chapman <[email protected]> Reviewed-by: Randy Dunlap <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 22bedad commit 21b4aaa

File tree

4 files changed

+7
-1
lines changed

4 files changed

+7
-1
lines changed

drivers/net/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ obj-$(CONFIG_PPP_DEFLATE) += ppp_deflate.o
160160
obj-$(CONFIG_PPP_BSDCOMP) += bsd_comp.o
161161
obj-$(CONFIG_PPP_MPPE) += ppp_mppe.o
162162
obj-$(CONFIG_PPPOE) += pppox.o pppoe.o
163-
obj-$(CONFIG_PPPOL2TP) += pppox.o pppol2tp.o
163+
obj-$(CONFIG_PPPOL2TP) += pppox.o
164164

165165
obj-$(CONFIG_SLIP) += slip.o
166166
obj-$(CONFIG_SLHC) += slhc.o

net/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ obj-$(CONFIG_BT) += bluetooth/
4040
obj-$(CONFIG_SUNRPC) += sunrpc/
4141
obj-$(CONFIG_AF_RXRPC) += rxrpc/
4242
obj-$(CONFIG_ATM) += atm/
43+
obj-$(CONFIG_PPPOL2TP) += l2tp/
4344
obj-$(CONFIG_DECNET) += decnet/
4445
obj-$(CONFIG_ECONET) += econet/
4546
obj-$(CONFIG_PHONET) += phonet/

net/l2tp/Makefile

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#
2+
# Makefile for the L2TP.
3+
#
4+
5+
obj-$(CONFIG_PPPOL2TP) += pppol2tp.o
File renamed without changes.

0 commit comments

Comments
 (0)