Port kmod-tun to the new module layout

SVN-Revision: 4633

diff --git a/openwrt/include/modules-2.6.mk b/openwrt/include/modules-2.6.mk
index 70a1fcc23c35b67d6cfd464012f945885d8eb384..08ac4da810a5527981f6693d6105edda1f873179 100644 (file)
--- 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 c24de60d0def8d02727836149637a4ddc58fb10e..9475620526c3f0bb5192f4d00377c2ad2df214c1 100644 (file)
--- 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 f9c72c01a52e59de685cc6ff865b8e1f55d5085f..9b505df133ef3092c32abdb8fc20c45493173829 100644 (file)
--- 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