[PATCH 4/5 2.6.21-rc4] l2tp: pppol2tp kbuild changes

[PATCH 4/5 2.6.21-rc4] l2tp: pppol2tp kbuild changes

[James Chapman]

[PPPOL2TP]: Modify kbuild for the new pppol2tp driver.

This patch adds a new config option, CONFIG_PPPOL2TP and adds
if_pppol2tp.h to the list of exported headers.

Signed-off-by: James Chapman <jchapman@katalix.com>

Index: linux-2.6.21-rc4/drivers/net/Kconfig
===================================================================
--- linux-2.6.21-rc4.orig/drivers/net/Kconfig
+++ linux-2.6.21-rc4/drivers/net/Kconfig
@@ -2812,6 +2812,19 @@ config PPPOATM
 	  which can lead to bad results if the ATM peer loses state and
 	  changes its encapsulation unilaterally.
 
+config PPPOL2TP
+	tristate "PPP over L2TP (EXPERIMENTAL)"
+	depends on EXPERIMENTAL && PPP
+	help
+	  Support for PPP-over-L2TP socket family. L2TP is a protocol
+	  used by ISPs and enterprises to tunnel PPP traffic over UDP
+	  tunnels. L2TP is replacing PPTP for VPN uses.
+
+	  This kernel component handles only L2TP data packets: a
+	  userland daemon handles L2TP the control protocol (tunnel
+	  and session setup). One such daemon is OpenL2TP
+	  (http://openl2tp.sourceforge.net/).
+
 config SLIP
 	tristate "SLIP (serial line) support"
 	---help---
Index: linux-2.6.21-rc4/drivers/net/Makefile
===================================================================
--- linux-2.6.21-rc4.orig/drivers/net/Makefile
+++ linux-2.6.21-rc4/drivers/net/Makefile
@@ -119,6 +119,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_SLIP) += slip.o
 obj-$(CONFIG_SLHC) += slhc.o
Index: linux-2.6.21-rc4/include/linux/Kbuild
===================================================================
--- linux-2.6.21-rc4.orig/include/linux/Kbuild
+++ linux-2.6.21-rc4/include/linux/Kbuild
@@ -220,6 +220,7 @@ unifdef-y += if_fddi.h
 unifdef-y += if_frad.h
 unifdef-y += if_ltalk.h
 unifdef-y += if_link.h
+unifdef-y += if_pppol2tp.h
 unifdef-y += if_pppox.h
 unifdef-y += if_shaper.h
 unifdef-y += if_tr.h

Re: [PATCH 4/5 2.6.21-rc4] l2tp: pppol2tp kbuild changes

[Patrick McHardy]

James Chapman wrote:
> [PPPOL2TP]: Modify kbuild for the new pppol2tp driver.
> 
> This patch adds a new config option, CONFIG_PPPOL2TP and adds
> if_pppol2tp.h to the list of exported headers.


This leaves the tree in a non-compiling state. Please fold into
the patch that actually adds the source files.