aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--package/kernel/modules/netsupport.mk37
-rw-r--r--target/linux/generic/config-2.6.353
-rw-r--r--target/linux/generic/config-2.6.363
-rw-r--r--target/linux/generic/config-2.6.373
4 files changed, 28 insertions, 18 deletions
diff --git a/package/kernel/modules/netsupport.mk b/package/kernel/modules/netsupport.mk
index 08068d1e6a..1baba4b5b7 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))
diff --git a/target/linux/generic/config-2.6.35 b/target/linux/generic/config-2.6.35
index 7a2ebeae7f..f1911ed3dd 100644
--- a/target/linux/generic/config-2.6.35
+++ b/target/linux/generic/config-2.6.35
@@ -1247,6 +1247,9 @@ CONFIG_KMOD=y
# CONFIG_KSM is not set
# CONFIG_KSZ884X_PCI 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_LAPB is not set
# CONFIG_LASAT is not set
diff --git a/target/linux/generic/config-2.6.36 b/target/linux/generic/config-2.6.36
index 5249a8b9d9..68be8b2314 100644
--- a/target/linux/generic/config-2.6.36
+++ b/target/linux/generic/config-2.6.36
@@ -1135,6 +1135,9 @@ CONFIG_KERNEL_LZMA=y
# CONFIG_KSM is not set
# CONFIG_KSZ884X_PCI 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_LAPB is not set
# CONFIG_LASAT is not set
diff --git a/target/linux/generic/config-2.6.37 b/target/linux/generic/config-2.6.37
index 9caef5dd40..5278c2bfe5 100644
--- a/target/linux/generic/config-2.6.37
+++ b/target/linux/generic/config-2.6.37
@@ -1123,6 +1123,9 @@ CONFIG_KERNEL_LZMA=y
# CONFIG_KSM is not set
# CONFIG_KSZ884X_PCI 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_LAPB is not set
# CONFIG_LASAT is not set