From e0d3bc1c95f3ac4b89be73ccc1d50acf51570344 Mon Sep 17 00:00:00 2001
From: Florian Fainelli <florian@openwrt.org>
Date: Tue, 22 Aug 2006 19:43:53 +0000
Subject: [PATCH] Port kmod-tun to the new module layout

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

diff --git a/openwrt/include/modules-2.6.mk b/openwrt/include/modules-2.6.mk
index 70a1fcc23c3..08ac4da810a 100644
--- a/openwrt/include/modules-2.6.mk
+++ b/openwrt/include/modules-2.6.mk
@@ -23,10 +23,6 @@ $(eval $(call KMOD_template,SCHED,sched,\
 	$(MODULES_DIR)/kernel/net/sched/*.ko \
 ,CONFIG_NET_SCHED))
 
-$(eval $(call KMOD_template,TUN,tun,\
-	$(MODULES_DIR)/kernel/drivers/net/tun.ko \
-,CONFIG_TUN,,20,tun))
-
 # Block devices
 
 $(eval $(call KMOD_template,LOOP,loop,\
diff --git a/openwrt/package/kernel/modules.mk b/openwrt/package/kernel/modules.mk
index c24de60d0de..9475620526c 100644
--- a/openwrt/package/kernel/modules.mk
+++ b/openwrt/package/kernel/modules.mk
@@ -297,6 +297,14 @@ FILES=$(MODULES_DIR)/kernel/net/ipv4/ip_gre.$(LINUX_KMOD_SUFFIX)
 endef
 $(eval $(call KernelPackage,gre))
 
+define KernelPackage/tun
+TITLE:=Universal TUN/TAP driver
+DESCRIPTION:=Kernel support for the TUN/TAP tunneling device
+KCONFIG:=$(CONFIG_TUN)
+FILES:=$(MODULES_DIR)/kernel/drivers/net/tun.$(LINUX_KMOD_SUFFIX)
+endef
+$(eval $(call KernelPackage,tun))
+
 define KernelPackage/ppp
 TITLE:=PPP modules
 DESCRIPTION:=Kernel modules for PPP support
diff --git a/openwrt/target/linux/Config.in b/openwrt/target/linux/Config.in
index f9c72c01a52..9b505df133e 100644
--- a/openwrt/target/linux/Config.in
+++ b/openwrt/target/linux/Config.in
@@ -16,13 +16,6 @@ config PACKAGE_KMOD_ATM
 	help
 	  ATM support
 
-config PACKAGE_KMOD_GRE
-	prompt "kmod-gre.......................... GRE tunneling driver"
-	tristate
-	default m
-	help
-	  Kernel support for GRE tunnels
-	
 config PACKAGE_KMOD_IPIP
 	prompt "kmod-ipip......................... IP in IP encapsulation support"
 	tristate
-- 
2.30.2