aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@openwrt.org>2010-11-10 19:10:38 +0000
committerHauke Mehrtens <hauke@openwrt.org>2010-11-10 19:10:38 +0000
commit3800e54517cab7701d04db79be407923c98fdd7b (patch)
tree1ebd3394c52668a259099b49a181b401cbbbf97f
parent533d918b54d0420f13aa187e196659337cf514f6 (diff)
downloadupstream-3800e54517cab7701d04db79be407923c98fdd7b.tar.gz
upstream-3800e54517cab7701d04db79be407923c98fdd7b.tar.bz2
upstream-3800e54517cab7701d04db79be407923c98fdd7b.zip
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
-rw-r--r--package/kernel/modules/netsupport.mk10
1 files 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)