diff options
| author | hauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-11-14 20:51:30 +0000 |
|---|---|---|
| committer | hauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-11-14 20:51:30 +0000 |
| commit | fe242ff768c8bb8a25bdb284d4d18295ff7689a3 (patch) | |
| tree | 23cf16eb3d1a00b0eb6dc112d3de6d4dbf142c36 /package/kernel | |
| parent | 7f98aaaa7a0e315ffda6441e2427b8e7262f4172 (diff) | |
kernel: fix l2tp kernel packages
l2tp-ip and l2tp-eth should depend on l2tp_netlink
fix pppol2tp for kernel >= 2.6.35
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23993 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/kernel')
| -rw-r--r-- | package/kernel/modules/netsupport.mk | 37 |
1 files changed, 19 insertions, 18 deletions
diff --git a/package/kernel/modules/netsupport.mk b/package/kernel/modules/netsupport.mk index 08068d1e6..1baba4b5b 100644 --- a/package/kernel/modules/netsupport.mk +++ b/package/kernel/modules/netsupport.mk @@ -473,11 +473,12 @@ define KernelPackage/pppol2tp DEPENDS:=kmod-ppp +kmod-pppoe +LINUX_2_6_35||LINUX_2_6_36||LINUX_2_6_37:kmod-l2tp KCONFIG:=CONFIG_PPPOL2TP 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 + FILES:=$(LINUX_DIR)/net/l2tp/l2tp_ppp.ko + AUTOLOAD:=$(call AutoLoad,40,l2tp_ppp) else FILES:=$(LINUX_DIR)/drivers/net/pppol2tp.ko + AUTOLOAD:=$(call AutoLoad,40,pppol2tp) endif - AUTOLOAD:=$(call AutoLoad,40,pppol2tp) endef define KernelPackage/pppol2tp/description @@ -630,10 +631,13 @@ $(eval $(call KernelPackage,pktgen)) define KernelPackage/l2tp SUBMENU:=$(NETWORK_SUPPORT_MENU) 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) - AUTOLOAD:=$(call AutoLoad,32,l2tp_core) + TITLE:=Layer Two Tunneling Protocol (L2TP) + KCONFIG:=CONFIG_L2TP \ + CONFIG_L2TP_V3=y \ + CONFIG_L2TP_DEBUGFS=n + FILES:=$(LINUX_DIR)/net/l2tp/l2tp_core.$(LINUX_KMOD_SUFFIX) \ + $(LINUX_DIR)/net/l2tp/l2tp_netlink.$(LINUX_KMOD_SUFFIX) + AUTOLOAD:=$(call AutoLoad,32,l2tp_core l2tp_netlink) endef define KernelPackage/l2tp/description @@ -642,36 +646,33 @@ endef $(eval $(call KernelPackage,l2tp)) + define KernelPackage/l2tp-eth SUBMENU:=$(NETWORK_SUPPORT_MENU) TITLE:=L2TP ethernet pseudowire support for L2TPv3 DEPENDS:=+kmod-l2tp - KCONFIG:= CONFIG_L2TP_V3=y \ - CONFIG_L2TP_ETH - FILES:= \ - $(LINUX_DIR)/net/l2tp/l2tp_netlink.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/net/l2tp/l2tp_eth.$(LINUX_KMOD_SUFFIX) - AUTOLOAD:=$(call AutoLoad,32,l2tp_core l2tp_netlink l2tp_eth) + KCONFIG:=CONFIG_L2TP_ETH + FILES:=$(LINUX_DIR)/net/l2tp/l2tp_eth.$(LINUX_KMOD_SUFFIX) + AUTOLOAD:=$(call AutoLoad,33,l2tp_eth) endef define KernelPackage/l2tp-eth/description - Kernel modules for L2TP V3 pseudowire support + Kernel modules for L2TP ethernet pseudowire support for L2TPv3 endef $(eval $(call KernelPackage,l2tp-eth)) define KernelPackage/l2tp-ip SUBMENU:=$(NETWORK_SUPPORT_MENU) - TITLE:=Support for L2TP-over-IP socket family + TITLE:=L2TP IP encapsulation for L2TPv3 DEPENDS:=+kmod-l2tp - KCONFIG:= CONFIG_L2TP_V3=y \ - CONFIG_L2TP_IP + KCONFIG:=CONFIG_L2TP_IP FILES:=$(LINUX_DIR)/net/l2tp/l2tp_ip.$(LINUX_KMOD_SUFFIX) - AUTOLOAD:=$(call AutoLoad,32,l2tp_core l2tp_ip) + AUTOLOAD:=$(call AutoLoad,33,l2tp_ip) endef define KernelPackage/l2tp-ip/description - Kernel modules for L2TP-over-IP socket family + Kernel modules for L2TP IP encapsulation for L2TPv3 endef $(eval $(call KernelPackage,l2tp-ip)) |