From 3800e54517cab7701d04db79be407923c98fdd7b Mon Sep 17 00:00:00 2001
From: Hauke Mehrtens <hauke@openwrt.org>
Date: Wed, 10 Nov 2010 19:10:38 +0000
Subject: l2tp: activate l2tp for kernel 2.6.36 and 2.6.37 and fix pppol2tp

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23948 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/kernel/modules/netsupport.mk | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/package/kernel/modules/netsupport.mk b/package/kernel/modules/netsupport.mk
index 703cc648ca..1659496b2d 100644
--- a/package/kernel/modules/netsupport.mk
+++ b/package/kernel/modules/netsupport.mk
@@ -471,9 +471,13 @@ $(eval $(call KernelPackage,pppoa))
 define KernelPackage/pppol2tp
   SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=PPPoL2TP support
-  DEPENDS:=kmod-ppp +kmod-pppoe
+  DEPENDS:=kmod-ppp +kmod-pppoe +LINUX_2_6_35||LINUX_2_6_36||LINUX_2_6_37:kmod-l2tp
   KCONFIG:=CONFIG_PPPOL2TP
-  FILES:=$(LINUX_DIR)/drivers/net/pppol2tp.ko
+  ifneq ($(CONFIG_LINUX_2_6_35)$(CONFIG_LINUX_2_6_36)$(CONFIG_LINUX_2_6_37),)
+    FILES:=$(LINUX_DIR)/net/l2tp/l2tp_ppp.mod.o
+  else
+    FILES:=$(LINUX_DIR)/drivers/net/pppol2tp.ko
+  endif
   AUTOLOAD:=$(call AutoLoad,40,pppol2tp)
 endef
 
@@ -626,7 +630,7 @@ $(eval $(call KernelPackage,pktgen))
 
 define KernelPackage/l2tp
   SUBMENU:=$(NETWORK_SUPPORT_MENU)
-  DEPENDS:=@LINUX_2_6_35
+  DEPENDS:=@LINUX_2_6_35||LINUX_2_6_36||LINUX_2_6_37
   TITLE:=L2TPv3 Support
   KCONFIG:=CONFIG_L2TP CONFIG_L2TP_DEBUGFS=n
   FILES:=$(LINUX_DIR)/net/l2tp/l2tp_core.$(LINUX_KMOD_SUFFIX)
-- 
cgit v1.2.3