From 34a8300f0d43175eb72fef0f470d72ccd213cb2b Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Sun, 20 Aug 2006 17:27:24 +0000
Subject: [PATCH] port kmod-ipv6 to the new system

SVN-Revision: 4615
---
 openwrt/include/modules-2.4.mk    | 4 ----
 openwrt/include/modules-2.6.mk    | 4 ----
 openwrt/package/kernel/modules.mk | 7 +++++++
 openwrt/target/linux/Config.in    | 7 -------
 4 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/openwrt/include/modules-2.4.mk b/openwrt/include/modules-2.4.mk
index b00b61c83a..7ef3323639 100644
--- a/openwrt/include/modules-2.4.mk
+++ b/openwrt/include/modules-2.4.mk
@@ -21,10 +21,6 @@ $(eval $(call KMOD_template,IPIP,ipip,\
 	$(MODULES_DIR)/kernel/net/ipv4/ipip.o \
 ,CONFIG_NET_IPIP,,60,ipip))
 
-$(eval $(call KMOD_template,IPV6,ipv6,\
-	$(MODULES_DIR)/kernel/net/ipv6/ipv6.o \
-,CONFIG_IPV6,,20,ipv6))
-
 $(eval $(call KMOD_template,SCHED,sched,\
 	$(MODULES_DIR)/kernel/net/sched/*.o \
 ))
diff --git a/openwrt/include/modules-2.6.mk b/openwrt/include/modules-2.6.mk
index a0ff900aa6..4ea28fb167 100644
--- a/openwrt/include/modules-2.6.mk
+++ b/openwrt/include/modules-2.6.mk
@@ -23,10 +23,6 @@ $(eval $(call KMOD_template,IPIP,ipip,\
 	$(MODULES_DIR)/kernel/net/ipv4/ipip.ko \
 ,CONFIG_NET_IPIP,,60,ipip))
 
-$(eval $(call KMOD_template,IPV6,ipv6,\
-	$(MODULES_DIR)/kernel/net/ipv6/ipv6.ko \
-,CONFIG_IPV6,,20,ipv6))
-
 $(eval $(call KMOD_template,SCHED,sched,\
 	$(MODULES_DIR)/kernel/net/sched/*.ko \
 ,CONFIG_NET_SCHED))
diff --git a/openwrt/package/kernel/modules.mk b/openwrt/package/kernel/modules.mk
index 51b7d8ace5..090945c3e0 100644
--- a/openwrt/package/kernel/modules.mk
+++ b/openwrt/package/kernel/modules.mk
@@ -281,6 +281,13 @@ KCONFIG:=$(CONFIG_BRIDGE_NF_EBTABLES)
 endef
 $(eval $(call KernelPackage,ebtables))
 
+define KernelPackage/ipv6
+TITLE:=IPv6 support
+DESCRIPTION:=Kernel modules for IPv6 support
+KCONFIG:=$(CONFIG_IPV6)
+FILES:=$(MODULES_DIR)/kernel/net/ipv6/ipv6.$(LINUX_KMOD_SUFFIX)
+endef
+$(eval $(call KernelPackage,ipv6))
 
 define KernelPackage/ppp
 TITLE:=PPP modules
diff --git a/openwrt/target/linux/Config.in b/openwrt/target/linux/Config.in
index 7589ea7b69..f9c72c01a5 100644
--- a/openwrt/target/linux/Config.in
+++ b/openwrt/target/linux/Config.in
@@ -30,13 +30,6 @@ config PACKAGE_KMOD_IPIP
 	help
 	  Kernel module for IP in IP encapsulation
 
-config PACKAGE_KMOD_IPV6
-	prompt "kmod-ipv6......................... IPv6 support"
-	tristate
-	default m
-	help
-	  Kernel modules for IPv6 protocol support
-
 config PACKAGE_KMOD_RING
 	prompt "kmod-ring......................... PF Ring"
 	tristate