Port kmod-tun to the new module layout

SVN-Revision: 4633

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,\

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

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