From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Wed, 10 Nov 2010 19:10:38 +0000 (+0000)
Subject: l2tp: activate l2tp for kernel 2.6.36 and 2.6.37 and fix pppol2tp
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=e24f008d09e44d67cabab08d356867a4046d73f8;p=openwrt%2Fstaging%2Fjow.git

l2tp: activate l2tp for kernel 2.6.36 and 2.6.37 and fix pppol2tp

SVN-Revision: 23948
---

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)