l2tp: Relocate pppol2tp driver to new net/l2tp directory (21b4aaa1) · Commits · 戴 / test

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 <jchapman@katalix.com> Reviewed-by:

Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by:

David S. Miller <davem@davemloft.net>

drivers/net/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -160,7 +160,7 @@ obj-$(CONFIG_PPP_DEFLATE) += ppp_deflate.o
		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

net/Makefile

+1 −0

Original line number	Diff line number	Diff line
		@@ -40,6 +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_DECNET) += decnet/
		obj-$(CONFIG_ECONET) += econet/
		obj-$(CONFIG_PHONET) += phonet/

net/l2tp/Makefile

0 → 100644

+5 −0

Original line number	Diff line number	Diff line
		#
		# Makefile for the L2TP.
		#

		obj-$(CONFIG_PPPOL2TP) += pppol2tp.o

drivers/net/pppol2tp.c→net/l2tp/pppol2tp.c

+0 −0

File moved.

View file

Admin message