qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-27 20:04:05 +02:00
Code

kernel: fix l2tp kernel packages

Browse Source 
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
This commit is contained in:
hauke 2010-11-14 20:51:30 +00:00
parent 7f98aaaa7a
commit fe242ff768
4 changed files with 28 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
package/kernel/modules/netsupport.mk
View File

@ -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 DEPENDS:=kmod-ppp +kmod-pppoe +LINUX_2_6_35||LINUX_2_6_36||LINUX_2_6_37:kmod-l2tp
KCONFIG:=CONFIG_PPPOL2TP KCONFIG:=CONFIG_PPPOL2TP
ifneq ($(CONFIG_LINUX_2_6_35)$(CONFIG_LINUX_2_6_36)$(CONFIG_LINUX_2_6_37),) 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 else
FILES:=$(LINUX_DIR)/drivers/net/pppol2tp.ko FILES:=$(LINUX_DIR)/drivers/net/pppol2tp.ko
AUTOLOAD:=$(call AutoLoad,40,pppol2tp)
endif endif
AUTOLOAD:=$(call AutoLoad,40,pppol2tp)
endef endef
define KernelPackage/pppol2tp/description define KernelPackage/pppol2tp/description
@ -630,10 +631,13 @@ $(eval $(call KernelPackage,pktgen))
define KernelPackage/l2tp define KernelPackage/l2tp
SUBMENU:=$(NETWORK_SUPPORT_MENU) SUBMENU:=$(NETWORK_SUPPORT_MENU)
DEPENDS:=@LINUX_2_6_35||LINUX_2_6_36||LINUX_2_6_37 DEPENDS:=@LINUX_2_6_35||LINUX_2_6_36||LINUX_2_6_37
TITLE:=L2TPv3 Support TITLE:=Layer Two Tunneling Protocol (L2TP)
KCONFIG:=CONFIG_L2TP CONFIG_L2TP_DEBUGFS=n KCONFIG:=CONFIG_L2TP \
FILES:=$(LINUX_DIR)/net/l2tp/l2tp_core.$(LINUX_KMOD_SUFFIX) CONFIG_L2TP_V3=y \
AUTOLOAD:=$(call AutoLoad,32,l2tp_core) 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 endef
define KernelPackage/l2tp/description define KernelPackage/l2tp/description
@ -642,36 +646,33 @@ endef
$(eval $(call KernelPackage,l2tp)) $(eval $(call KernelPackage,l2tp))
define KernelPackage/l2tp-eth define KernelPackage/l2tp-eth
SUBMENU:=$(NETWORK_SUPPORT_MENU) SUBMENU:=$(NETWORK_SUPPORT_MENU)
TITLE:=L2TP ethernet pseudowire support for L2TPv3 TITLE:=L2TP ethernet pseudowire support for L2TPv3
DEPENDS:=+kmod-l2tp DEPENDS:=+kmod-l2tp
KCONFIG:= CONFIG_L2TP_V3=y \ KCONFIG:=CONFIG_L2TP_ETH
CONFIG_L2TP_ETH FILES:=$(LINUX_DIR)/net/l2tp/l2tp_eth.$(LINUX_KMOD_SUFFIX)
FILES:= \ AUTOLOAD:=$(call AutoLoad,33,l2tp_eth)
$(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)
endef endef
define KernelPackage/l2tp-eth/description define KernelPackage/l2tp-eth/description
Kernel modules for L2TP V3 pseudowire support Kernel modules for L2TP ethernet pseudowire support for L2TPv3
endef endef
$(eval $(call KernelPackage,l2tp-eth)) $(eval $(call KernelPackage,l2tp-eth))
define KernelPackage/l2tp-ip define KernelPackage/l2tp-ip
SUBMENU:=$(NETWORK_SUPPORT_MENU) SUBMENU:=$(NETWORK_SUPPORT_MENU)
TITLE:=Support for L2TP-over-IP socket family TITLE:=L2TP IP encapsulation for L2TPv3
DEPENDS:=+kmod-l2tp DEPENDS:=+kmod-l2tp
KCONFIG:= CONFIG_L2TP_V3=y \ KCONFIG:=CONFIG_L2TP_IP
CONFIG_L2TP_IP
FILES:=$(LINUX_DIR)/net/l2tp/l2tp_ip.$(LINUX_KMOD_SUFFIX) 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 endef
define KernelPackage/l2tp-ip/description define KernelPackage/l2tp-ip/description
Kernel modules for L2TP-over-IP socket family Kernel modules for L2TP IP encapsulation for L2TPv3
endef endef
$(eval $(call KernelPackage,l2tp-ip)) $(eval $(call KernelPackage,l2tp-ip))

3
target/linux/generic/config-2.6.35
View File

@ -1247,6 +1247,9 @@ CONFIG_KMOD=y
# CONFIG_KSM is not set # CONFIG_KSM is not set
# CONFIG_KSZ884X_PCI is not set # CONFIG_KSZ884X_PCI is not set
# CONFIG_L2TP is not set # CONFIG_L2TP is not set
# CONFIG_L2TP_ETH is not set
# CONFIG_L2TP_IP is not set
# CONFIG_L2TP_V3 is not set
# CONFIG_LANMEDIA is not set # CONFIG_LANMEDIA is not set
# CONFIG_LAPB is not set # CONFIG_LAPB is not set
# CONFIG_LASAT is not set # CONFIG_LASAT is not set

3
target/linux/generic/config-2.6.36
View File

@ -1135,6 +1135,9 @@ CONFIG_KERNEL_LZMA=y
# CONFIG_KSM is not set # CONFIG_KSM is not set
# CONFIG_KSZ884X_PCI is not set # CONFIG_KSZ884X_PCI is not set
# CONFIG_L2TP is not set # CONFIG_L2TP is not set
# CONFIG_L2TP_ETH is not set
# CONFIG_L2TP_IP is not set
# CONFIG_L2TP_V3 is not set
# CONFIG_LANMEDIA is not set # CONFIG_LANMEDIA is not set
# CONFIG_LAPB is not set # CONFIG_LAPB is not set
# CONFIG_LASAT is not set # CONFIG_LASAT is not set

3
target/linux/generic/config-2.6.37
View File

@ -1123,6 +1123,9 @@ CONFIG_KERNEL_LZMA=y
# CONFIG_KSM is not set # CONFIG_KSM is not set
# CONFIG_KSZ884X_PCI is not set # CONFIG_KSZ884X_PCI is not set
# CONFIG_L2TP is not set # CONFIG_L2TP is not set
# CONFIG_L2TP_ETH is not set
# CONFIG_L2TP_IP is not set
# CONFIG_L2TP_V3 is not set
# CONFIG_LANMEDIA is not set # CONFIG_LANMEDIA is not set
# CONFIG_LAPB is not set # CONFIG_LAPB is not set
# CONFIG_LASAT is not set # CONFIG_LASAT is not set